Compare commits

1 Commits
main ... 1.1

11 changed files with 102 additions and 250 deletions

View File

@@ -1,29 +1,27 @@
libboost_atomic1_86_0
libboost_container1_86_0
libboost_context1_86_0
libboost_coroutine1_86_0
libboost_date_time1_86_0
libboost_fiber1_86_0
libboost_filesystem1_86_0
libboost_graph1_86_0
libboost_graph_parallel1_86_0
libboost_iostreams1_86_0
libboost_locale1_86_0
libboost_math1_86_0
libboost_mpi1_86_0
libboost_nowide1_86_0
libboost_test1_86_0
libboost_process1_86_0
libboost_program_options1_86_0
libboost_python-py3-1_86_0
libboost_random1_86_0
libboost_serialization1_86_0
libboost_stacktrace1_86_0
libboost_system1_86_0
libboost_thread1_86_0
libboost_type_erasure1_86_0
libboost_wave1_86_0
libboost_url1_86_0
libboost_regex1_86_0
libboost_json1_86_0
libboost_charconv1_86_0
libboost_atomic1_84_0
libboost_container1_84_0
libboost_context1_84_0
libboost_coroutine1_84_0
libboost_date_time1_84_0
libboost_fiber1_84_0
libboost_filesystem1_84_0
libboost_graph1_84_0
libboost_graph_parallel1_84_0
libboost_iostreams1_84_0
libboost_locale1_84_0
libboost_math1_84_0
libboost_mpi1_84_0
libboost_nowide1_84_0
libboost_test1_84_0
libboost_program_options1_84_0
libboost_python-py3-1_84_0
libboost_random1_84_0
libboost_serialization1_84_0
libboost_stacktrace1_84_0
libboost_system1_84_0
libboost_thread1_84_0
libboost_type_erasure1_84_0
libboost_wave1_84_0
libboost_url1_84_0
libboost_regex1_84_0
libboost_json1_84_0

View File

@@ -2,15 +2,15 @@ Index: boost_1_80_0/tools/build/src/tools/python.jam
===================================================================
--- boost_1_80_0.orig/tools/build/src/tools/python.jam
+++ boost_1_80_0/tools/build/src/tools/python.jam
@@ -102,7 +102,7 @@
@@ -102,7 +102,7 @@ py3-version = ;
# using python : 2.3 : /usr/local/bin/python ;
#
rule init ( version ? : cmd-or-prefix ? : includes * : libraries ?
- : condition * : extension-suffix ? )
+ : condition * : extension-suffix ? : abi-letters ? )
{
if ! $(.initialized)
{
project.push-current $(.project) ;
@@ -115,7 +115,7 @@ rule init ( version ? : cmd-or-prefix ?
}
}

View File

@@ -1,26 +0,0 @@
https://bugs.gentoo.org/932459
https://github.com/boostorg/python/issues/431
https://github.com/boostorg/python/pull/432
From 33ac06ca59a68266d3d26edf08205d31ddab4a6c Mon Sep 17 00:00:00 2001
From: Alexis DUBURCQ <alexis.duburcq@gmail.com>
Date: Fri, 15 Mar 2024 14:10:16 +0100
Subject: [PATCH] Support numpy 2.0.0b1
--- a/libs/python/src/numpy/dtype.cpp
+++ b/libs/python/src/numpy/dtype.cpp
@@ -98,7 +98,13 @@ python::detail::new_reference dtype::convert(object const & arg, bool align)
return python::detail::new_reference(reinterpret_cast<PyObject*>(obj));
}
-int dtype::get_itemsize() const { return reinterpret_cast<PyArray_Descr*>(ptr())->elsize;}
+int dtype::get_itemsize() const {
+#if NPY_ABI_VERSION < 0x02000000
+ return reinterpret_cast<PyArray_Descr*>(ptr())->elsize;
+#else
+ return PyDataType_ELSIZE(reinterpret_cast<PyArray_Descr*>(ptr()));
+#endif
+}
bool equivalent(dtype const & a, dtype const & b) {
// On Windows x64, the behaviour described on

View File

@@ -2,8 +2,8 @@ Index: boost_1_80_0/tools/build/src/tools/gcc.jam
===================================================================
--- boost_1_80_0.orig/tools/build/src/tools/gcc.jam
+++ boost_1_80_0/tools/build/src/tools/gcc.jam
@@ -390,7 +390,6 @@
compile-link-flags <target-os>$(generic-os)/<architecture>s390x/<address-model>64 : -m64 ;
@@ -371,7 +371,6 @@ local rule compile-link-flags ( * )
local generic-os = [ set.difference $(all-os) : aix hpux ] ;
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 ;

View File

@@ -1,34 +0,0 @@
https://github.com/boostorg/uuid/issues/166
https://github.com/boostorg/compute/pull/887
https://github.com/boostorg/compute/pull/893
diff --git a/boost/compute/detail/sha1.hpp b/boost/compute/detail/sha1.hpp
index 5afe5f9c4..3a1820074 100644
--- a/boost/compute/detail/sha1.hpp
+++ b/boost/compute/detail/sha1.hpp
@@ -37,13 +37,22 @@ class sha1 {
}
operator std::string() {
+ #if BOOST_VERSION >= 108600
+ boost::uuids::detail::sha1::digest_type digest;
+ #else
unsigned int digest[5];
+ #endif
+
h.get_digest(digest);
std::ostringstream buf;
+ #if BOOST_VERSION >= 108600
+ for(int i = 0; i < 20; ++i)
+ buf << std::hex << std::setfill('0') << std::setw(2) << +digest[i];
+ #else
for(int i = 0; i < 5; ++i)
buf << std::hex << std::setfill('0') << std::setw(8) << digest[i];
-
+ #endif
return buf.str();
}
private:

23
boost-process.patch Normal file
View File

@@ -0,0 +1,23 @@
From e08374ed95ac33865bda40602c94909e7cd9607f Mon Sep 17 00:00:00 2001
From: Eddie-cz <48474051+Eddie-cz@users.noreply.github.com>
Date: Mon, 2 Aug 2021 10:49:42 +0200
Subject: [PATCH] Update wchar_t.hpp
---
include/boost/process/detail/traits/wchar_t.hpp | 2 ++
1 file changed, 2 insertions(+)
diff --git a/include/boost/process/detail/traits/wchar_t.hpp b/include/boost/process/detail/traits/wchar_t.hpp
index 812a92c..98026d3 100644
--- a/include/boost/process/detail/traits/wchar_t.hpp
+++ b/include/boost/process/detail/traits/wchar_t.hpp
@@ -12,6 +12,8 @@
#include <boost/process/detail/traits/env.hpp>
#include <boost/process/locale.hpp>
+#include <algorithm>
+
namespace boost { namespace process { namespace detail {
//template

View File

@@ -1,49 +1,3 @@
-------------------------------------------------------------------
Mon Sep 02 12:53:15 CEST 2024 - aschnell@suse.com
- fix compilation of compute module (gh#boostorg/uuid#166)
- boost-compute-uuid.patch: added
-------------------------------------------------------------------
Fri Aug 30 10:41:54 CEST 2024 - aschnell@suse.com
- update to 1.86.0
* process turned into compile library
* for details on all changes see,
https://www.boost.org/users/history/version_1_86_0.html
- boost-aarch64-flags.patch: updated
- boost-1.57.0-python-abi_letters.patch: updated
- boost-process.patch: removed (included upstream)
- boost-charconv-quadmath.patch: removed (improved upstream)
-------------------------------------------------------------------
Sat Jun 29 09:13:57 CEST 2024 - Friedrich Haubensak <hsk17@mail.de>
- add patch boost-1.85.0-python-numpy-2.patch from upstream
-------------------------------------------------------------------
Tue Apr 23 09:50:52 CEST 2024 - aschnell@suse.com
- update to 1.85.0
* new libraries:
+ charconv (implementation of <charconv>)
+ scope (collection of scope guard utilities)
* for details on all changes see,
https://www.boost.org/users/history/version_1_85_0.html
- dynamic_linking.patch: updated
- boost-charconv-quadmath.patch: added
-------------------------------------------------------------------
Wed Mar 20 12:15:08 UTC 2024 - Richard Biener <rguenther@suse.com>
- Avoid BuildRequire of 'gcc-c++ > 5' which is only a redundant
check. This interferes with Substitute.
-------------------------------------------------------------------
Wed Feb 21 09:18:53 CET 2024 - aschnell@suse.com
- avoid obsolete rpm syntax
-------------------------------------------------------------------
Thu Dec 14 08:43:05 CET 2023 - aschnell@suse.com
@@ -440,8 +394,7 @@ Fri Apr 12 11:48:21 UTC 2019 - Adam Majer <adam.majer@suse.de>
For detailed changes see
https://www.boost.org/users/history/version_1_70_0.html
- 0001-beast-fix-moved-from-executor.patch: upstream patch to fix
regression
- 0001-beast-fix-moved-from-executor.patch: upstream patch to fix regresion
- boost-rpmoptflags-only.patch: refresh but don't disable all extra
warnings
- dynamic_linking.patch: refreshed
@@ -1525,6 +1478,7 @@ Thu Aug 26 10:55:59 CEST 2010 - pth@suse.de
http://www.boost.org/users/news/version_1_43_0 and
http://www.boost.org/users/news/version_1_44_0.
-------------------------------------------------------------------
Fri Jul 9 13:17:57 CEST 2010 - pth@suse.de
@@ -1532,6 +1486,7 @@ Fri Jul 9 13:17:57 CEST 2010 - pth@suse.de
The patch adds an explicite specialization to the call to prevent
unwanted temporary instantiations.
-------------------------------------------------------------------
Fri Jul 9 09:34:03 UTC 2010 - lnussel@suse.de
@@ -1965,7 +1920,7 @@ Fri Oct 31 12:40:57 CET 2008 - pth@suse.de
- Disable deletion of full-name symlinks in boost.spec.in.
- Make boost-devel directly require all library subpackages.
- boost.rpm isn't needed, even for updates, so don't build it and
remove the README file needed only for this package.
remove the README file needeed only for this package.
- Make debug package require all library subpackages.
- Add pre_checkin.sh to ensure that boost.spec is regenerated
at check-in time.
@@ -2327,7 +2282,7 @@ Thu Aug 9 15:16:09 CEST 2007 - pth@suse.de
added.
o Member function get_value_or(alternative_value) added.
o Incompatibility bug with mpl::apply<> fixed.
o Incompatbility bug with mpl::apply<> fixed.
o Converting assignment bug with uninitialized lvalues fixed.
* Parameter Library:
@@ -2386,7 +2341,7 @@ Thu Aug 9 15:16:09 CEST 2007 - pth@suse.de
o lexicographical_compare
o join
o New comparison predicates is_less, is_not_greater.
o Negative indexes support (like Perl) in various algorithms
o Negative indexes support (like Perl) in various algorihtms
(*_head/tail, *_nth).
* Wave Library:

View File

@@ -1,7 +1,7 @@
#
# spec file for package boost
# spec file
#
# Copyright (c) 2024 SUSE LLC
# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,9 +19,9 @@
#
%global flavor @BUILD_FLAVOR@%{nil}
%define ver 1.86.0
%define _ver 1_86_0
%define package_version 1_86_0
%define ver 1.84.0
%define _ver 1_84_0
%define package_version 1_84_0
%define file_version %_ver
%define lib_appendix %_ver
%define docs_version 1.56.0
@@ -172,7 +172,7 @@ ExcludeArch: s390x %{ix86} ppc64 ppc64le
%endif
# Python NumPy library is only available on Leap 42.1 OpenSUSE onward
# and is not available in SLE
# and is not availble in SLE
%if 0%{?suse_version} >= 1330 || 0%{?is_opensuse}
%bcond_without python_numpy
%else
@@ -213,9 +213,9 @@ ExcludeArch: s390x %{ix86} ppc64 ppc64le
%endif
Name: %{base_name}
Version: 1.86.0
Version: 1.84.0
Release: 0
%define library_version 1_86_0
%define library_version 1_84_0
Summary: Boost C++ Libraries
License: BSL-1.0
Group: Development/Libraries/C and C++
@@ -240,14 +240,11 @@ Patch15: boost-1.57.0-python-abi_letters.patch
Patch16: boost-1.55.0-python-test-PyImport_AppendInittab.patch
Patch17: python_mpi.patch
Patch18: dynamic_linking.patch
Patch19: boost-compute-uuid.patch
Patch20: python_library_name.patch
Patch21: boost-remove-cmakedir.patch
# PATCH-FIX-UPSTREAM boost-1.85.0-python-numpy-2.patch -- gh#boostorg/python/pull/432
Patch24: boost-1.85.0-python-numpy-2.patch
Patch22: boost-process.patch
%{?suse_build_hwcaps_libs}
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: gmp-devel
BuildRequires: libbz2-devel
BuildRequires: libexpat-devel
@@ -255,6 +252,11 @@ BuildRequires: libicu-devel
BuildRequires: libzstd-devel
BuildRequires: xz-devel
BuildRequires: pkgconfig(zlib)
%if %{with boost_fiber}
BuildRequires: gcc-c++ > 5
%else
BuildRequires: gcc-c++
%endif
%if ! %{build_base}
BuildRequires: dos2unix
%if %{with python3}
@@ -383,7 +385,7 @@ Requires: %{package_name}
%description -n %{package_name}-python3
This package contains the Boost.MPI Python 3.x serialization
interface.
inteface.
%endif
%package -n boost%{library_version}-jam
@@ -810,7 +812,7 @@ Requires: boost-license%{library_version}
%description -n libboost_mpi_python-py3-%{library_version}
This package contains the Boost.MPI Python 3.x serialization
interface.
inteface.
%package -n libboost_mpi_python-py3-%{library_version}-devel
Summary: Development library for Boost.MPI Python 3.x serialization
@@ -843,7 +845,7 @@ Group: System/Libraries
Requires: boost-license%{library_version}
%description -n libboost_test%{library_version}
This package contains the Boost.Test runtime library.
This package contains the BoosttTest runtime library.
%package -n libboost_test%{library_version}-devel
Summary: Development headers for Boost.Test library
@@ -860,27 +862,6 @@ Development headers for Boost.Test library. Boost.Test supports for
simple program testing, full unit testing, and for program execution
monitoring.
%package -n libboost_process%{library_version}
Summary: Boost.Process runtime library
Group: System/Libraries/C and C++
Requires: boost-license%{library_version}
%description -n libboost_process%{library_version}
This package contains the Boost.Process runtime library.
%package -n libboost_process%{library_version}-devel
Summary: Development headers for Boost.Process library
Group: Development/Libraries/C and C++
Requires: libboost_headers%{library_version}-devel = %{version}
Requires: libboost_process%{library_version} = %{version}
Conflicts: boost-devel < 1.86
Conflicts: libboost_process-devel-impl
Provides: libboost_process-devel-impl = %{version}
%description -n libboost_process%{library_version}-devel
This package contains development headers for Boost.Process
library.
%package -n libboost_program_options%{library_version}
Summary: Boost.ProgramOptions runtime library
Group: System/Libraries
@@ -1235,25 +1216,6 @@ Provides: libboost_json-devel-impl = %{version}
%description -n libboost_json%{library_version}-devel
This package contains development headers for Boost.JSON library.
%package -n libboost_charconv%{library_version}
Summary: Boost.CharConv runtime library
Group: System/Libraries
Requires: boost-license%{library_version}
%description -n libboost_charconv%{library_version}
This package contains Boost::CharConv runtime library.
%package -n libboost_charconv%{library_version}-devel
Summary: Development headers for Boost.CharConv library
Group: Development/Libraries/C and C++
Requires: libboost_charconv%{library_version} = %{version}
Requires: libboost_container%{library_version}-devel = %{version}
Conflicts: libboost_charconv-devel-impl
Provides: libboost_charconv-devel-impl = %{version}
%description -n libboost_charconv%{library_version}-devel
This package contains development headers for Boost.CharConv library.
%package -n %{package_name}-quickbook
Summary: Documentation tool geared towards C++
Group: Development/Tools/Doc Generators
@@ -1278,21 +1240,20 @@ tasks.
%setup -q -n boost_%{library_version} -b 3
#everything in the tarball has the executable flag set ...
find -type f ! \( -name \*.sh -o -name \*.py -o -name \*.pl \) -exec chmod -x {} +
%patch -P 1 -p1
%patch -P 2
%patch -P 4
%patch -P 5
%patch -P 6 -p1
%patch -P 7
%patch -P 9 -p1
%patch -P 15 -p1
%patch -P 16 -p1
%patch -P 17 -p1
%patch -P 18 -p1
%patch -P 19 -p1
%patch -P 20 -p1
%patch -P 21 -p1
%patch -P 24 -p1
%patch1 -p1
%patch2
%patch4
%patch5
%patch6 -p1
%patch7
%patch9 -p1
%patch15 -p1
%patch16 -p1
%patch17 -p1
%patch18 -p1
%patch20 -p1
%patch21 -p1
%patch22 -p2
%build
find . -type f -exec chmod u+w {} +
@@ -1395,7 +1356,6 @@ EOF
./b2 -d+2 -q --user-config=./user-config-py3.jam \
--debug-configuration \
boost.stacktrace.from_exception=off \
--build-type=minimal --build-dir=./python3-build \
--python-buildid=py3 \
--stagedir=./python3-stage %{?_smp_mflags} \
@@ -1426,7 +1386,6 @@ echo 'using mpi ;' >> ./user-config.jam
# This is run for both mini and non-mini build
./b2 -d+2 -q --user-config=./user-config.jam \
--debug-configuration \
boost.stacktrace.from_exception=off \
--build-type=minimal --build-dir=./build \
--stagedir=./stage %{?_smp_mflags} \
$LIBRARIES_FLAGS \
@@ -1474,7 +1433,6 @@ module load gnu %mpi_flavor
%if %{with python3}
./b2 -d+2 -q --user-config=./user-config-py3.jam \
--debug-configuration \
boost.stacktrace.from_exception=off \
--build-type=minimal --build-dir=./python3-build \
--python-buildid=py3 \
--prefix=%{buildroot}%{package_prefix} --exec-prefix=%{buildroot}%{package_bindir} \
@@ -1489,7 +1447,6 @@ module load gnu %mpi_flavor
# Generic install
./b2 -d+2 -q \
--debug-configuration \
boost.stacktrace.from_exception=off \
--build-type=minimal --build-dir=./build --stagedir=./stage \
--prefix=%{buildroot}%{package_prefix} --exec-prefix=%{buildroot}%{package_bindir} \
--libdir=%{buildroot}%{package_libdir} --includedir=%{buildroot}%{package_includedir} \
@@ -1640,14 +1597,12 @@ EOF
%post -n libboost_iostreams%{library_version} -p /sbin/ldconfig
%post -n libboost_log%{library_version} -p /sbin/ldconfig
%post -n libboost_test%{library_version} -p /sbin/ldconfig
%post -n libboost_process%{library_version} -p /sbin/ldconfig
%post -n libboost_program_options%{library_version} -p /sbin/ldconfig
%post -n libboost_regex%{library_version} -p /sbin/ldconfig
%post -n libboost_serialization%{library_version} -p /sbin/ldconfig
%post -n libboost_thread%{library_version} -p /sbin/ldconfig
%post -n libboost_type_erasure%{library_version} -p /sbin/ldconfig
%post -n libboost_json%{library_version} -p /sbin/ldconfig
%post -n libboost_charconv%{library_version} -p /sbin/ldconfig
%post -n libboost_math%{library_version} -p /sbin/ldconfig
%post -n libboost_nowide%{library_version} -p /sbin/ldconfig
%post -n libboost_graph%{library_version} -p /sbin/ldconfig
@@ -1694,14 +1649,12 @@ EOF
%postun -n libboost_iostreams%{library_version} -p /sbin/ldconfig
%postun -n libboost_log%{library_version} -p /sbin/ldconfig
%postun -n libboost_test%{library_version} -p /sbin/ldconfig
%postun -n libboost_process%{library_version} -p /sbin/ldconfig
%postun -n libboost_program_options%{library_version} -p /sbin/ldconfig
%postun -n libboost_regex%{library_version} -p /sbin/ldconfig
%postun -n libboost_serialization%{library_version} -p /sbin/ldconfig
%postun -n libboost_thread%{library_version} -p /sbin/ldconfig
%postun -n libboost_type_erasure%{library_version} -p /sbin/ldconfig
%postun -n libboost_json%{library_version} -p /sbin/ldconfig
%postun -n libboost_charconv%{library_version} -p /sbin/ldconfig
%postun -n libboost_math%{library_version} -p /sbin/ldconfig
%postun -n libboost_nowide%{library_version} -p /sbin/ldconfig
%postun -n libboost_graph%{library_version} -p /sbin/ldconfig
@@ -1914,14 +1867,6 @@ EOF
%{package_libdir}/libboost_test_exec_monitor.so
%{package_libdir}/libboost_unit_test_framework.so
%files -n libboost_process%{library_version}
%{package_libdir}/libboost_process.so.%{version}
%files -n libboost_process%{library_version}-devel
%dir %{package_libdir}/cmake/boost_process-%{version}
%{package_libdir}/cmake/boost_process-%{version}/*
%{package_libdir}/libboost_process.so
%files -n libboost_program_options%{library_version}
%{package_libdir}/libboost_program_options.so.%{version}
@@ -2114,14 +2059,6 @@ EOF
%{package_libdir}/cmake/boost_json-%{version}/*
%{package_libdir}/libboost_json.so
%files -n libboost_charconv%{library_version}
%{package_libdir}/libboost_charconv.so.%{version}
%files -n libboost_charconv%{library_version}-devel
%dir %{package_libdir}/cmake/boost_charconv-%{version}
%{package_libdir}/cmake/boost_charconv-%{version}/*
%{package_libdir}/libboost_charconv.so
%endif
%if ! %{build_base}

BIN
boost_1_84_0.tar.bz2 (Stored with Git LFS) Normal file

Binary file not shown.

BIN
boost_1_86_0.tar.bz2 (Stored with Git LFS)

Binary file not shown.

View File

@@ -37,13 +37,12 @@ Index: boost_1_80_0/libs/chrono/build/Jamfile.v2
<toolset>gcc-3.4.4:<linkflags>--enable-auto-import
<toolset>gcc-4.3.4:<linkflags>--enable-auto-import
<toolset>gcc-4.4.0,<target-os>windows:<linkflags>--enable-auto-import
@@ -104,8 +104,8 @@ lib boost_chrono
@@ -104,7 +104,7 @@ lib boost_chrono
: $(SOURCES).cpp
:
$(cxx11-requirements)
<link>shared:<define>BOOST_CHRONO_DYN_LINK=1 # tell source we're building dll's
- <link>static:<define>BOOST_CHRONO_STATIC_LINK=1 # tell source we're building static lib's
+ # <link>static:<define>BOOST_CHRONO_STATIC_LINK=1 # tell source we're building static lib's
<link>shared:<define>BOOST_ALL_DYN_LINK=1 # tell source we're building dll's
- <link>static:<define>BOOST_All_STATIC_LINK=1 # tell source we're building static lib's
+ # <link>static:<define>BOOST_All_STATIC_LINK=1 # tell source we're building static lib's
;
boost-install boost_chrono ;
@@ -106,6 +105,6 @@ Index: boost_1_80_0/libs/filesystem/build/Jamfile.v2
<link>shared:<define>BOOST_FILESYSTEM_DYN_LINK=1
- <link>static:<define>BOOST_FILESYSTEM_STATIC_LINK=1
+# <link>static:<define>BOOST_FILESYSTEM_STATIC_LINK=1
$(cxx_requirements)
: usage-requirements
$(cxx_requirements)
:
:
;