commit 7c906af1bb8cd616fa6348b45f619e4c04f748a0
Author: Jan Rękorajski <bagg...@pld-linux.org>
Date: Tue Dec 24 14:45:57 2024 +0100
- downgrade to 1.85, epoch 1 for clean package upgrades
Too many APIs have been removed after 1.85 causing a lot of packages
to stop building and requiring non-trivial changes. Move back to 1.85
so packages that need modern APIs (e.g. FreeCAD) will get them,
and those relying on deprecated APIs will still build.
boost-clean-gcc-flags.patch | 4 +---
boost-python-abi_letters.patch | 4 ++--
boost.spec | 10 ++++------
includes.patch | 2 +-
4 files changed, 8 insertions(+), 12 deletions(-)
---
diff --git a/boost.spec b/boost.spec
index ded2fe6..e65ee98 100644
--- a/boost.spec
+++ b/boost.spec
@@ -13,12 +13,13 @@
Summary: The Boost C++ Libraries
Summary(pl.UTF-8): Biblioteki C++ "Boost"
Name: boost
-Version: 1.87.0
-Release: 2
+Version: 1.85.0
+Release: 1
+Epoch: 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: ccdfe37d3bad682d841782f760faf141
+# Source0-md5: 429d451cb9197143cc77962c5ff272ef
Patch0: %{name}-link.patch
Patch1: %{name}-clean-gcc-flags.patch
Patch2: %{name}-fallthrough.patch
@@ -708,7 +709,6 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libdir}/libboost_coroutine.so.*.*.*
%attr(755,root,root) %{_libdir}/libboost_iostreams.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.*.*.*
@@ -735,7 +735,6 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libdir}/libboost_log_setup.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
@@ -774,7 +773,6 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libboost_log_setup.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 f5e6b81..9918d59 100644
--- a/boost-clean-gcc-flags.patch
+++ b/boost-clean-gcc-flags.patch
@@ -1,13 +1,11 @@
--- 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,13 +356,6 @@
+@@ -356,11 +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 700a994..7e25618 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 ? )
{
- if ! $(.initialized)
- {
+ project.push-current $(.project) ;
+
@@ -107,7 +107,7 @@ rule init ( version ? : cmd-or-prefix ?
}
}
diff --git a/includes.patch b/includes.patch
index 3cfb7fd..1b991aa 100644
--- a/includes.patch
+++ b/includes.patch
@@ -1,9 +1,9 @@
--- boost_1_87_0/boost/lockfree/detail/freelist.hpp.orig 2024-12-05
01:53:33.000000000 +0100
+++ boost_1_87_0/boost/lockfree/detail/freelist.hpp 2024-12-23
17:20:21.772444369 +0100
@@ -10,6 +10,7 @@
+ #ifndef BOOST_LOCKFREE_FREELIST_HPP_INCLUDED
#define BOOST_LOCKFREE_FREELIST_HPP_INCLUDED
- #include <array>
+#include <cstdint>
#include <cstring>
#include <limits>
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/boost.git/commitdiff/7c906af1bb8cd616fa6348b45f619e4c04f748a0
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
