commit e2fa9c018051e8d7725e30f885b9f0675707b1a3
Author: Jan Rękorajski <bagg...@pld-linux.org>
Date: Sat Dec 14 18:18:50 2024 +0100
- up to 1.87.0
boost-clean-gcc-flags.patch | 4 +++-
boost-python-abi_letters.patch | 4 ++--
boost.spec | 27 ++++++++++++++-------------
uarg-def.patch | 31 -------------------------------
4 files changed, 19 insertions(+), 47 deletions(-)
---
diff --git a/boost.spec b/boost.spec
index b3f27b0..94866ad 100644
--- a/boost.spec
+++ b/boost.spec
@@ -13,16 +13,15 @@
Summary: The Boost C++ Libraries
Summary(pl.UTF-8): Biblioteki C++ "Boost"
Name: boost
-Version: 1.82.0
+Version: 1.87.0
Release: 1
License: Boost Software License and others
Group: Libraries
Source0:
https://boostorg.jfrog.io/artifactory/main/release/%{version}/source/%{name}_%{fver}.tar.bz2
-# Source0-md5: b45dac8b54b58c087bfbed260dbfc03a
+# Source0-md5: ccdfe37d3bad682d841782f760faf141
Patch0: %{name}-link.patch
Patch1: %{name}-clean-gcc-flags.patch
Patch2: %{name}-fallthrough.patch
-Patch3: uarg-def.patch
# FC Patches:
Patch201: %{name}-python-abi_letters.patch
# https://svn.boost.org/trac/boost/ticket/5637
@@ -509,14 +508,13 @@ Dokumentacja dla biblioteki Boost C++.
%prep
%setup -q -n %{name}_%{fver}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
+%patch -P 0 -p1
+%patch -P 1 -p1
+%patch -P 2 -p1
-%patch201 -p1
-%patch203 -p0
-%patch221 -p1
+%patch -P 201 -p1
+%patch -P 203 -p0
+%patch -P 221 -p1
%if "%{cc_version}" < "6.0"
CPPSTD="-std=c++11"
@@ -699,12 +697,13 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libboost_atomic.so.*.*.*
+%attr(755,root,root) %{_libdir}/libboost_charconv.so.*.*.*
%attr(755,root,root) %{_libdir}/libboost_container.so.*.*.*
%attr(755,root,root) %{_libdir}/libboost_contract.so.*.*.*
%attr(755,root,root) %{_libdir}/libboost_coroutine.so.*.*.*
%attr(755,root,root) %{_libdir}/libboost_iostreams.so.*.*.*
-%attr(755,root,root) %{_libdir}/libboost_math_*.so.*.*.*
%attr(755,root,root) %{_libdir}/libboost_nowide.so.*.*.*
+%attr(755,root,root) %{_libdir}/libboost_process.so.*.*.*
%attr(755,root,root) %{_libdir}/libboost_random.so.*.*.*
%attr(755,root,root) %{_libdir}/libboost_serialization.so.*.*.*
%attr(755,root,root) %{_libdir}/libboost_stacktrace_*.so.*.*.*
@@ -714,6 +713,7 @@ rm -rf $RPM_BUILD_ROOT
%files devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libboost_atomic.so
+%attr(755,root,root) %{_libdir}/libboost_charconv.so
%attr(755,root,root) %{_libdir}/libboost_chrono.so
%attr(755,root,root) %{_libdir}/libboost_container.so
%attr(755,root,root) %{_libdir}/libboost_context.so
@@ -728,9 +728,9 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libdir}/libboost_locale.so
%attr(755,root,root) %{_libdir}/libboost_log.so
%attr(755,root,root) %{_libdir}/libboost_log_setup.so
-%attr(755,root,root) %{_libdir}/libboost_math_*.so
%attr(755,root,root) %{_libdir}/libboost_nowide.so
%attr(755,root,root) %{_libdir}/libboost_prg_exec_monitor.so
+%attr(755,root,root) %{_libdir}/libboost_process.so
%attr(755,root,root) %{_libdir}/libboost_program_options.so
%attr(755,root,root) %{_libdir}/libboost_regex.so
%attr(755,root,root) %{_libdir}/libboost_random.so
@@ -751,6 +751,7 @@ rm -rf $RPM_BUILD_ROOT
%files static
%defattr(644,root,root,755)
%{_libdir}/libboost_atomic.a
+%{_libdir}/libboost_charconv.a
%{_libdir}/libboost_chrono.a
%{_libdir}/libboost_container.a
%{_libdir}/libboost_context.a
@@ -766,9 +767,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libboost_locale.a
%{_libdir}/libboost_log.a
%{_libdir}/libboost_log_setup.a
-%{_libdir}/libboost_math_*.a
%{_libdir}/libboost_nowide.a
%{_libdir}/libboost_prg_exec_monitor.a
+%{_libdir}/libboost_process.a
%{_libdir}/libboost_program_options.a
%{_libdir}/libboost_random.a
%{_libdir}/libboost_regex.a
diff --git a/boost-clean-gcc-flags.patch b/boost-clean-gcc-flags.patch
index 9918d59..f5e6b81 100644
--- a/boost-clean-gcc-flags.patch
+++ b/boost-clean-gcc-flags.patch
@@ -1,11 +1,13 @@
--- boost_1_67_0/tools/build/src/tools/gcc.jam.orig 2018-04-11
15:49:09.000000000 +0200
+++ boost_1_67_0/tools/build/src/tools/gcc.jam 2018-07-16 19:40:36.332045183
+0200
-@@ -356,11 +356,6 @@
+@@ -356,13 +356,6 @@
compile-link-flags <target-os>hpux/<address-model>32 : -milp32 ;
compile-link-flags <target-os>hpux/<address-model>64 : -mlp64 ;
-
- local generic-os = [ set.difference $(all-os) : aix hpux ] ;
+- compile-link-flags
<target-os>$(generic-os)/<architecture>s390x/<address-model>32 : -m31 ;
+- compile-link-flags
<target-os>$(generic-os)/<architecture>s390x/<address-model>64 : -m64 ;
- local arch = power sparc x86 ;
- compile-link-flags
<target-os>$(generic-os)/<architecture>$(arch)/<address-model>32 : -m32 ;
- compile-link-flags
<target-os>$(generic-os)/<architecture>$(arch)/<address-model>64 : -m64 ;
diff --git a/boost-python-abi_letters.patch b/boost-python-abi_letters.patch
index 7e25618..700a994 100644
--- a/boost-python-abi_letters.patch
+++ b/boost-python-abi_letters.patch
@@ -7,8 +7,8 @@
- : condition * : extension-suffix ? )
+ : condition * : extension-suffix ? : abi-letters ? )
{
- project.push-current $(.project) ;
-
+ if ! $(.initialized)
+ {
@@ -107,7 +107,7 @@ rule init ( version ? : cmd-or-prefix ?
}
}
diff --git a/uarg-def.patch b/uarg-def.patch
deleted file mode 100644
index 41a7c08..0000000
--- a/uarg-def.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From cc9bc2387fe19d6cb130460defe52ee8ecefe968 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
- <congdan...@gmail.com>
-Date: Tue, 29 Nov 2022 07:34:17 +0700
-Subject: [PATCH] stl/tuple: change uarg##N to internal linkage
-
-8b6a9c2 (std::tuple support (Resolving #103) (#104), 2021-03-11) put
-uarg##N in all translation units, which includes
-boost/phoenix/stl/tuple.hpp or boost/phoenix/stl.hpp, with external
-linkage. Thus, we'll run into below error:
-
-> multiple definition of `boost::phoenix::placeholders::uarg1'
-
-Change it to internal linkage.
----
- include/boost/phoenix/stl/tuple.hpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/boost/phoenix/stl/tuple.hpp
b/include/boost/phoenix/stl/tuple.hpp
-index a83014ac..d04ad16e 100644
---- a/boost/phoenix/stl/tuple.hpp
-+++ b/boost/phoenix/stl/tuple.hpp
-@@ -110,7 +110,7 @@ namespace boost { namespace phoenix {
- namespace placeholders {
- #define BOOST_PP_LOCAL_LIMITS (1, BOOST_PHOENIX_ARG_LIMIT)
- #define BOOST_PP_LOCAL_MACRO(N)
\
-- auto uarg##N =
\
-+ const auto uarg##N =
\
- boost::phoenix::get_<(N)-1>(boost::phoenix::placeholders::arg1);
- #include BOOST_PP_LOCAL_ITERATE()
- }
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/boost.git/commitdiff/e2fa9c018051e8d7725e30f885b9f0675707b1a3
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
