Compare commits
No commits in common. "factory" and "devel" have entirely different histories.
@ -1,29 +1,29 @@
|
||||
libboost_atomic1_87_0
|
||||
libboost_container1_87_0
|
||||
libboost_context1_87_0
|
||||
libboost_coroutine1_87_0
|
||||
libboost_date_time1_87_0
|
||||
libboost_fiber1_87_0
|
||||
libboost_filesystem1_87_0
|
||||
libboost_graph1_87_0
|
||||
libboost_graph_parallel1_87_0
|
||||
libboost_iostreams1_87_0
|
||||
libboost_locale1_87_0
|
||||
libboost_math1_87_0
|
||||
libboost_mpi1_87_0
|
||||
libboost_nowide1_87_0
|
||||
libboost_test1_87_0
|
||||
libboost_process1_87_0
|
||||
libboost_program_options1_87_0
|
||||
libboost_python-py3-1_87_0
|
||||
libboost_random1_87_0
|
||||
libboost_serialization1_87_0
|
||||
libboost_stacktrace1_87_0
|
||||
libboost_system1_87_0
|
||||
libboost_thread1_87_0
|
||||
libboost_type_erasure1_87_0
|
||||
libboost_wave1_87_0
|
||||
libboost_url1_87_0
|
||||
libboost_regex1_87_0
|
||||
libboost_json1_87_0
|
||||
libboost_charconv1_87_0
|
||||
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
|
||||
|
26
boost-1.85.0-python-numpy-2.patch
Normal file
26
boost-1.85.0-python-numpy-2.patch
Normal file
@ -0,0 +1,26 @@
|
||||
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
|
17
boost-charconv-quadmath.patch
Normal file
17
boost-charconv-quadmath.patch
Normal file
@ -0,0 +1,17 @@
|
||||
The quadmath detection is broken, see https://github.com/boostorg/charconv/issues/191.
|
||||
Just disable quadmath.
|
||||
|
||||
--- a/boost/charconv/detail/config.hpp 2024-04-23 11:38:55.099806792 +0200
|
||||
+++ b/boost/charconv/detail/config.hpp 2024-04-23 11:39:01.966514420 +0200
|
||||
@@ -27,11 +27,6 @@
|
||||
# define BOOST_CHARCONV_UINT128_MAX (2 * static_cast<boost::uint128_type>(BOOST_CHARCONV_INT128_MAX) + 1)
|
||||
#endif
|
||||
|
||||
-#if defined(BOOST_HAS_FLOAT128) && !defined(__STRICT_ANSI__) && !defined(BOOST_CHARCONV_NO_QUADMATH)
|
||||
-# define BOOST_CHARCONV_HAS_FLOAT128
|
||||
-# include <quadmath.h>
|
||||
-#endif
|
||||
-
|
||||
#ifndef BOOST_NO_CXX14_CONSTEXPR
|
||||
# define BOOST_CHARCONV_CXX14_CONSTEXPR BOOST_CXX14_CONSTEXPR
|
||||
# define BOOST_CHARCONV_CXX14_CONSTEXPR_NO_INLINE BOOST_CXX14_CONSTEXPR
|
34
boost-compute-uuid.patch
Normal file
34
boost-compute-uuid.patch
Normal file
@ -0,0 +1,34 @@
|
||||
|
||||
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
23
boost-process.patch
Normal 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
|
||||
|
@ -1,28 +0,0 @@
|
||||
See https://github.com/boostorg/smart_ptr/commit/e7433ba54596da97cb7859455cd37ca140305a9c.
|
||||
|
||||
diff --git a/include/boost/smart_ptr/intrusive_ptr.hpp b/include/boost/smart_ptr/intrusive_ptr.hpp
|
||||
index ddb20c0b0e..11b476513a 100644
|
||||
--- a/boost/smart_ptr/intrusive_ptr.hpp
|
||||
+++ b/boost/smart_ptr/intrusive_ptr.hpp
|
||||
@@ -285,7 +285,7 @@ template<class T, class U> intrusive_ptr<T> dynamic_pointer_cast( intrusive_ptr<
|
||||
|
||||
// operator<<
|
||||
|
||||
-template<class Y> std::ostream & operator<< (std::ostream & os, intrusive_ptr<Y> const & p)
|
||||
+template<class E, class T, class Y> std::basic_ostream<E, T> & operator<< (std::basic_ostream<E, T> & os, intrusive_ptr<Y> const & p)
|
||||
{
|
||||
os << p.get();
|
||||
return os;
|
||||
diff --git a/include/boost/smart_ptr/shared_ptr.hpp b/include/boost/smart_ptr/shared_ptr.hpp
|
||||
index 2431a33590..2deed9b632 100644
|
||||
--- a/boost/smart_ptr/shared_ptr.hpp
|
||||
+++ b/boost/smart_ptr/shared_ptr.hpp
|
||||
@@ -775,7 +775,7 @@ template<class T> inline typename shared_ptr<T>::element_type * get_pointer(shar
|
||||
|
||||
// operator<<
|
||||
|
||||
-template<class Y> std::ostream & operator<< (std::ostream & os, shared_ptr<Y> const & p)
|
||||
+template<class E, class T, class Y> std::basic_ostream<E, T> & operator<< (std::basic_ostream<E, T> & os, shared_ptr<Y> const & p)
|
||||
{
|
||||
os << p.get();
|
||||
return os;
|
@ -2,10 +2,10 @@ Index: libs/python/build/Jamfile
|
||||
===================================================================
|
||||
--- libs/python/build/Jamfile.orig
|
||||
+++ libs/python/build/Jamfile
|
||||
@@ -115,6 +115,7 @@
|
||||
-<tag>@%boostcpp.tag
|
||||
@@ -94,6 +94,7 @@ lib boost_python
|
||||
<python-debugging>on:<define>BOOST_DEBUG_PYTHON
|
||||
-<tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).tag
|
||||
<tag>@tag
|
||||
<tag>@python-tag
|
||||
+ <cxxflags>-fno-strict-aliasing
|
||||
<conditional>@python.require-py
|
||||
|
||||
|
@ -1,50 +1,3 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Mar 06 13:20:02 CET 2025 - aschnell@suse.com
|
||||
|
||||
- package mpi python cmake file once (gh#espressomd/espresso#5050)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 25 08:23:54 CET 2025 - aschnell@suse.com
|
||||
|
||||
- fixed required of process devel
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Feb 24 10:19:36 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
|
||||
|
||||
- Modernize specfile: use ldconfig_scriptlets
|
||||
- Remove idempotent %if..%endif guards
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Feb 20 11:25:55 UTC 2025 - Nicolas Morey <nicolas.morey@suse.com>
|
||||
|
||||
- Remove dependency from boost-extra to openmpi for 32b systems
|
||||
as OpenMPI >= 5 has dropped support for 32b architectures.
|
||||
- Exclude arm 32b builds for HPC flavours.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jan 31 11:05:20 CET 2025 - aschnell@suse.com
|
||||
|
||||
- added boost-smart-ptr.patch from upstream (bsc#1234430)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jan 07 10:32:50 CET 2025 - aschnell@suse.com
|
||||
|
||||
- updated source URL
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Dec 12 07:35:36 CET 2024 - aschnell@suse.com
|
||||
|
||||
- update to 1.87.0
|
||||
* new libraries:
|
||||
+ Parser (framework for building parsers)
|
||||
* for details on all changes see,
|
||||
https://www.boost.org/users/history/version_1_87_0.html
|
||||
- boost-strict_aliasing.patch: updated
|
||||
- python_mpi.patch: updated
|
||||
- dynamic_linking.patch: updated
|
||||
- boost-compute-uuid.patch: included upstream
|
||||
- boost-1.85.0-python-numpy-2.patch: included upstream
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 02 12:53:15 CEST 2024 - aschnell@suse.com
|
||||
|
||||
@ -143,7 +96,7 @@ Wed Mar 8 19:11:00 UTC 2023 - Martin Pluskal <mpluskal@suse.com>
|
||||
Sat Jan 28 22:01:20 UTC 2023 - Dirk Müller <dmueller@suse.com>
|
||||
|
||||
- add boost-phoenix-revert-std-tuple-support.patch to fix
|
||||
libetonyek and others build that use boost::phoenix
|
||||
libetonyek and others build that use boost::phoenix
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Dec 14 18:00:01 CET 2022 - Arvin Schnell <aschnell@suse.com>
|
||||
|
198
boost.spec
198
boost.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package boost
|
||||
#
|
||||
# Copyright (c) 2025 SUSE LLC
|
||||
# Copyright (c) 2024 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.87.0
|
||||
%define _ver 1_87_0
|
||||
%define package_version 1_87_0
|
||||
%define ver 1.86.0
|
||||
%define _ver 1_86_0
|
||||
%define package_version 1_86_0
|
||||
%define file_version %_ver
|
||||
%define lib_appendix %_ver
|
||||
%define docs_version 1.56.0
|
||||
@ -57,7 +57,6 @@ ExclusiveArch: do_not_build
|
||||
%define build_base 1
|
||||
%define name_suffix -base
|
||||
%bcond_with hpc
|
||||
%bcond_with python3
|
||||
%bcond_with mpi
|
||||
%endif
|
||||
|
||||
@ -65,11 +64,8 @@ ExclusiveArch: do_not_build
|
||||
%define build_base 0
|
||||
%define name_suffix -extra
|
||||
%bcond_without python3
|
||||
%ifnarch %{arm} %ix86
|
||||
# OpenMPI 5 has no support for 32bit architectures
|
||||
%bcond_without mpi
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%if "%{flavor}" == "gnu-hpc"
|
||||
%define build_base 1
|
||||
@ -171,12 +167,19 @@ ExclusiveArch: do_not_build
|
||||
%if %{with ringdisabled}
|
||||
ExclusiveArch: do-not-build
|
||||
%else
|
||||
ExcludeArch: s390x %{ix86} ppc64 ppc64le %{arm}
|
||||
ExcludeArch: s390x %{ix86} ppc64 ppc64le
|
||||
%endif
|
||||
%endif
|
||||
|
||||
# context hasn't been ported to all architectures yet (looks complete now - aschnell - 2024-12-11)
|
||||
%ifarch %{ix86} %{x86_64} %{arm} aarch64 mips ppc ppc64 ppc64le riscv64 s390x
|
||||
# Python NumPy library is only available on Leap 42.1 OpenSUSE onward
|
||||
# and is not available in SLE
|
||||
%if 0%{?suse_version} >= 1330 || 0%{?is_opensuse}
|
||||
%bcond_without python_numpy
|
||||
%else
|
||||
%bcond_with python_numpy
|
||||
%endif
|
||||
# context hasn't been ported to most architectures yet
|
||||
%ifarch %{ix86} x86_64 %{arm} aarch64 mips ppc ppc64 ppc64le riscv64 s390x
|
||||
%bcond_without build_context
|
||||
%else
|
||||
%bcond_with build_context
|
||||
@ -210,14 +213,14 @@ ExcludeArch: s390x %{ix86} ppc64 ppc64le %{arm}
|
||||
%endif
|
||||
|
||||
Name: %{base_name}
|
||||
Version: 1.87.0
|
||||
Version: 1.86.0
|
||||
Release: 0
|
||||
%define library_version 1_87_0
|
||||
%define library_version 1_86_0
|
||||
Summary: Boost C++ Libraries
|
||||
License: BSL-1.0
|
||||
Group: Development/Libraries/C and C++
|
||||
URL: https://www.boost.org
|
||||
Source0: https://archives.boost.io/release/%{version}/source/boost_%{_ver}.tar.bz2
|
||||
Source0: https://boostorg.jfrog.io/artifactory/main/release/%{version}/source/boost_%{_ver}.tar.bz2
|
||||
Source1: boost-rpmlintrc
|
||||
Source3: https://downloads.sourceforge.net/project/boost/boost-docs/1.56.0/boost_1_56_pdf.tar.bz2
|
||||
Source4: existing_extra_docs
|
||||
@ -237,9 +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
|
||||
Patch22: boost-smart-ptr.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
|
||||
%{?suse_build_hwcaps_libs}
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: gcc-c++
|
||||
@ -254,8 +259,10 @@ BuildRequires: pkgconfig(zlib)
|
||||
BuildRequires: dos2unix
|
||||
%if %{with python3}
|
||||
BuildRequires: python3-devel
|
||||
%if %{with python_numpy}
|
||||
BuildRequires: python3-numpy-devel
|
||||
%endif
|
||||
%endif
|
||||
%if %{with build_docs}
|
||||
BuildRequires: docbook
|
||||
BuildRequires: docbook-xsl-stylesheets
|
||||
@ -368,6 +375,7 @@ This package contains all that is needed to develop/compile
|
||||
applications that use the Boost C++ libraries. For documentation see
|
||||
the documentation packages (html, man or pdf).
|
||||
|
||||
%if %{with hpc}
|
||||
%package -n %{package_name}-python3
|
||||
Summary: Boost.MPI Python 3.x serialization library
|
||||
Group: System/Libraries
|
||||
@ -376,6 +384,7 @@ Requires: %{package_name}
|
||||
%description -n %{package_name}-python3
|
||||
This package contains the Boost.MPI Python 3.x serialization
|
||||
interface.
|
||||
%endif
|
||||
|
||||
%package -n boost%{library_version}-jam
|
||||
Summary: A Boost Make Replacement
|
||||
@ -611,7 +620,6 @@ Group: Development/Libraries/C and C++
|
||||
Requires: libboost_atomic%{library_version}-devel = %{version}
|
||||
Requires: libboost_filesystem%{library_version} = %{version}
|
||||
Requires: libboost_headers%{library_version}-devel = %{version}
|
||||
Requires: libboost_system%{library_version}-devel = %{version}
|
||||
Requires: libstdc++-devel
|
||||
Conflicts: boost-devel < 1.63
|
||||
Conflicts: libboost_filesystem-devel-impl
|
||||
@ -662,8 +670,6 @@ Summary: Development headers for Boost.IOStreans library
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: libboost_headers%{library_version}-devel = %{version}
|
||||
Requires: libboost_iostreams%{library_version} = %{version}
|
||||
Requires: libboost_random%{library_version}-devel = %{version}
|
||||
Requires: libboost_regex%{library_version}-devel = %{version}
|
||||
Requires: pkgconfig(bzip2)
|
||||
Requires: pkgconfig(liblzma)
|
||||
Requires: pkgconfig(libzstd)
|
||||
@ -694,7 +700,6 @@ Requires: libboost_date_time%{library_version}-devel = %{version}
|
||||
Requires: libboost_filesystem%{library_version}-devel = %{version}
|
||||
Requires: libboost_headers%{library_version}-devel = %{version}
|
||||
Requires: libboost_log%{library_version} = %{version}
|
||||
Requires: libboost_random%{library_version}-devel = %{version}
|
||||
Requires: libboost_regex%{library_version}-devel = %{version}
|
||||
Requires: libboost_thread%{library_version} = %{version}
|
||||
Conflicts: boost-devel < 1.63
|
||||
@ -868,7 +873,7 @@ 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.87
|
||||
Conflicts: boost-devel < 1.86
|
||||
Conflicts: libboost_process-devel-impl
|
||||
Provides: libboost_process-devel-impl = %{version}
|
||||
|
||||
@ -910,8 +915,6 @@ bindings.
|
||||
%package -n libboost_python-py3-%{library_version}-devel
|
||||
Summary: Development headers for Boost.Python library
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: libboost_container%{library_version}-devel = %{version}
|
||||
Requires: libboost_graph%{library_version}-devel = %{version}
|
||||
Requires: libboost_headers%{library_version}-devel = %{version}
|
||||
Requires: libboost_python-py3-%{library_version} = %{version}
|
||||
Conflicts: boost-devel < 1.63
|
||||
@ -1286,9 +1289,10 @@ find -type f ! \( -name \*.sh -o -name \*.py -o -name \*.pl \) -exec chmod -x {}
|
||||
%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 22 -p1
|
||||
%patch -P 24 -p1
|
||||
|
||||
%build
|
||||
find . -type f -exec chmod u+w {} +
|
||||
@ -1504,14 +1508,11 @@ module load gnu %mpi_flavor
|
||||
ln -s libboost_python-py3.so %{buildroot}%{package_libdir}/libboost_python3.so
|
||||
%endif
|
||||
|
||||
%if %{with python3} && %{with mpi}
|
||||
%if %{with python3}
|
||||
mkdir -p %{buildroot}%{package_python3_sitearch}/boost/parallel/mpi/
|
||||
install -m 0644 libs/mpi/build/__init__.py %{buildroot}%{package_python3_sitearch}/boost/parallel/mpi/
|
||||
install -m 0644 %{SOURCE11} %{buildroot}%{package_python3_sitearch}/boost/parallel
|
||||
install -m 0644 %{SOURCE11} %{buildroot}%{package_python3_sitearch}/boost
|
||||
# Boost 1.87 packages a python cmake file in both the mpi-python dir and the mpi directory.
|
||||
# It should not be in that second one
|
||||
rm -f %{buildroot}%{package_libdir}/cmake/boost_mpi-%{version}/libboost_mpi-variant-shared-py3*.cmake
|
||||
%if ! %{with hpc}
|
||||
mv %{buildroot}%{_libdir}/boost-python3.*/mpi.%{py3_soflags}.so %{buildroot}%{package_python3_sitearch}/mpi.%{py3_soflags}.so
|
||||
rmdir %{buildroot}%{_libdir}/boost-python3.*
|
||||
@ -1555,8 +1556,6 @@ find %{buildroot}%{package_datadir}/boost-build/ -type f \! -name \*.py \! -name
|
||||
find %{buildroot}%{package_datadir}/boost-build/ -type f -exec chmod 644 {} +
|
||||
%endif
|
||||
|
||||
rm -r %{buildroot}%{package_datadir}/boost_predef
|
||||
|
||||
# Remove exception library, but only if the symbols are not
|
||||
# actually used. For now, the only symbol that is linked is
|
||||
# should never be used as it's only available on Windows. So,
|
||||
@ -1583,14 +1582,6 @@ rm %{buildroot}%{package_libdir}/cmake/BoostDetectToolset-%{version}.cmake
|
||||
rm -r %{buildroot}%{package_libdir}/cmake/Boost-%{version}
|
||||
rm -r %{buildroot}%{package_libdir}/cmake/boost_headers-%{version}
|
||||
rm -rf %{buildroot}%{package_libdir}/cmake/boost_{w,}serialization-%{version}
|
||||
rm -r %{buildroot}%{package_libdir}/cmake/boost_container-%{version}
|
||||
rm -f %{buildroot}%{package_libdir}/libboost_container.so*
|
||||
rm -r %{buildroot}%{package_libdir}/cmake/boost_graph-%{version}
|
||||
rm -f %{buildroot}%{package_libdir}/libboost_graph.so*
|
||||
# If no library was needed to be built, system was built to avoid building everything.
|
||||
# If needs to be removed from the extra package in that case
|
||||
rm -Rf %{buildroot}%{package_libdir}/cmake/boost_system-%{version}
|
||||
rm -Rf %{buildroot}%{package_libdir}/libboost_system.so*
|
||||
|
||||
rm -r %{buildroot}%{package_includedir}/boost
|
||||
rm -f %{buildroot}%{package_libdir}/libboost_{w,}serialization*
|
||||
@ -1638,55 +1629,112 @@ EOF
|
||||
%endif
|
||||
|
||||
%if %{build_base}
|
||||
%ldconfig_scriptlets -n libboost_atomic%{library_version}
|
||||
%ldconfig_scriptlets -n libboost_container%{library_version}
|
||||
%ldconfig_scriptlets -n libboost_context%{library_version}
|
||||
%ldconfig_scriptlets -n libboost_contract%{library_version}
|
||||
%ldconfig_scriptlets -n libboost_coroutine%{library_version}
|
||||
%ldconfig_scriptlets -n libboost_date_time%{library_version}
|
||||
%ldconfig_scriptlets -n libboost_fiber%{library_version}
|
||||
%ldconfig_scriptlets -n libboost_filesystem%{library_version}
|
||||
%ldconfig_scriptlets -n libboost_iostreams%{library_version}
|
||||
%ldconfig_scriptlets -n libboost_log%{library_version}
|
||||
%ldconfig_scriptlets -n libboost_test%{library_version}
|
||||
%ldconfig_scriptlets -n libboost_process%{library_version}
|
||||
%ldconfig_scriptlets -n libboost_program_options%{library_version}
|
||||
%ldconfig_scriptlets -n libboost_regex%{library_version}
|
||||
%ldconfig_scriptlets -n libboost_serialization%{library_version}
|
||||
%ldconfig_scriptlets -n libboost_thread%{library_version}
|
||||
%ldconfig_scriptlets -n libboost_type_erasure%{library_version}
|
||||
%ldconfig_scriptlets -n libboost_json%{library_version}
|
||||
%ldconfig_scriptlets -n libboost_charconv%{library_version}
|
||||
%ldconfig_scriptlets -n libboost_math%{library_version}
|
||||
%ldconfig_scriptlets -n libboost_nowide%{library_version}
|
||||
%ldconfig_scriptlets -n libboost_graph%{library_version}
|
||||
%ldconfig_scriptlets -n libboost_stacktrace%{library_version}
|
||||
%ldconfig_scriptlets -n libboost_system%{library_version}
|
||||
%ldconfig_scriptlets -n libboost_wave%{library_version}
|
||||
%ldconfig_scriptlets -n libboost_url%{library_version}
|
||||
%ldconfig_scriptlets -n libboost_random%{library_version}
|
||||
%ldconfig_scriptlets -n libboost_chrono%{library_version}
|
||||
%ldconfig_scriptlets -n libboost_locale%{library_version}
|
||||
%ldconfig_scriptlets -n libboost_timer%{library_version}
|
||||
%post -n libboost_atomic%{library_version} -p /sbin/ldconfig
|
||||
%post -n libboost_container%{library_version} -p /sbin/ldconfig
|
||||
%post -n libboost_context%{library_version} -p /sbin/ldconfig
|
||||
%post -n libboost_contract%{library_version} -p /sbin/ldconfig
|
||||
%post -n libboost_coroutine%{library_version} -p /sbin/ldconfig
|
||||
%post -n libboost_date_time%{library_version} -p /sbin/ldconfig
|
||||
%post -n libboost_fiber%{library_version} -p /sbin/ldconfig
|
||||
%post -n libboost_filesystem%{library_version} -p /sbin/ldconfig
|
||||
%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
|
||||
%post -n libboost_stacktrace%{library_version} -p /sbin/ldconfig
|
||||
%post -n libboost_system%{library_version} -p /sbin/ldconfig
|
||||
%post -n libboost_wave%{library_version} -p /sbin/ldconfig
|
||||
%post -n libboost_url%{library_version} -p /sbin/ldconfig
|
||||
%post -n libboost_random%{library_version} -p /sbin/ldconfig
|
||||
%post -n libboost_chrono%{library_version} -p /sbin/ldconfig
|
||||
%post -n libboost_locale%{library_version} -p /sbin/ldconfig
|
||||
%post -n libboost_timer%{library_version} -p /sbin/ldconfig
|
||||
%else
|
||||
|
||||
%if %{with python3}
|
||||
%ldconfig_scriptlets -n libboost_python-py3-%{library_version}
|
||||
%ldconfig_scriptlets -n libboost_numpy-py3-%{library_version}
|
||||
%post -n libboost_python-py3-%{library_version} -p /sbin/ldconfig
|
||||
%if %{with python_numpy}
|
||||
%post -n libboost_numpy-py3-%{library_version} -p /sbin/ldconfig
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%if %{with mpi}
|
||||
%ldconfig_scriptlets -n libboost_mpi%{library_version}
|
||||
%ldconfig_scriptlets -n libboost_graph_parallel%{library_version}
|
||||
%post -n libboost_mpi%{library_version} -p /sbin/ldconfig
|
||||
%post -n libboost_graph_parallel%{library_version} -p /sbin/ldconfig
|
||||
|
||||
%if %{with python3}
|
||||
%ldconfig_scriptlets -n libboost_mpi_python-py3-%{library_version}
|
||||
%post -n libboost_mpi_python-py3-%{library_version} -p /sbin/ldconfig
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%endif
|
||||
%if %{with hpc}
|
||||
%ldconfig_scriptlets -n %base_name
|
||||
%post -n %base_name -p /sbin/ldconfig
|
||||
%endif
|
||||
|
||||
%if %{build_base}
|
||||
%postun -n libboost_atomic%{library_version} -p /sbin/ldconfig
|
||||
%postun -n libboost_container%{library_version} -p /sbin/ldconfig
|
||||
%postun -n libboost_context%{library_version} -p /sbin/ldconfig
|
||||
%postun -n libboost_contract%{library_version} -p /sbin/ldconfig
|
||||
%postun -n libboost_coroutine%{library_version} -p /sbin/ldconfig
|
||||
%postun -n libboost_date_time%{library_version} -p /sbin/ldconfig
|
||||
%postun -n libboost_fiber%{library_version} -p /sbin/ldconfig
|
||||
%postun -n libboost_filesystem%{library_version} -p /sbin/ldconfig
|
||||
%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
|
||||
%postun -n libboost_stacktrace%{library_version} -p /sbin/ldconfig
|
||||
%postun -n libboost_system%{library_version} -p /sbin/ldconfig
|
||||
%postun -n libboost_wave%{library_version} -p /sbin/ldconfig
|
||||
%postun -n libboost_url%{library_version} -p /sbin/ldconfig
|
||||
%postun -n libboost_random%{library_version} -p /sbin/ldconfig
|
||||
%postun -n libboost_chrono%{library_version} -p /sbin/ldconfig
|
||||
%postun -n libboost_locale%{library_version} -p /sbin/ldconfig
|
||||
%postun -n libboost_timer%{library_version} -p /sbin/ldconfig
|
||||
%else
|
||||
|
||||
%if %{with python3}
|
||||
%postun -n libboost_python-py3-%{library_version} -p /sbin/ldconfig
|
||||
%if %{with python_numpy}
|
||||
%postun -n libboost_numpy-py3-%{library_version} -p /sbin/ldconfig
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%if %{with mpi}
|
||||
%postun -n libboost_mpi%{library_version} -p /sbin/ldconfig
|
||||
%postun -n libboost_graph_parallel%{library_version} -p /sbin/ldconfig
|
||||
|
||||
%if %{with python3}
|
||||
%postun -n libboost_mpi_python-py3-%{library_version} -p /sbin/ldconfig
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%endif
|
||||
|
||||
%if %{with hpc}
|
||||
%postun -n %{base_name} -p /sbin/ldconfig
|
||||
%endif
|
||||
|
||||
%if %{with hpc}
|
||||
@ -1827,10 +1875,8 @@ EOF
|
||||
%endif
|
||||
|
||||
%files -n libboost_math%{library_version}-devel
|
||||
%dir %{package_libdir}/cmake/boost_math-%{version}
|
||||
%dir %{package_libdir}/cmake/boost_math_c99*-%{version}
|
||||
%dir %{package_libdir}/cmake/boost_math_tr1*-%{version}
|
||||
%{package_libdir}/cmake/boost_math-%{version}/*
|
||||
%{package_libdir}/cmake/boost_math_c99*-%{version}/*
|
||||
%{package_libdir}/cmake/boost_math_tr1*-%{version}/*
|
||||
%{package_libdir}/libboost_math_c99f.so
|
||||
@ -1937,6 +1983,7 @@ EOF
|
||||
%{package_libdir}/libboost_python3.so
|
||||
%{package_libdir}/libboost_python-py3.so
|
||||
|
||||
%if %{with python_numpy}
|
||||
%files -n libboost_numpy-py3-%{library_version}
|
||||
%{package_libdir}/libboost_numpy-py3.so.1*
|
||||
|
||||
@ -1946,6 +1993,7 @@ EOF
|
||||
%{package_libdir}/cmake/boost_numpy-%{version}/*
|
||||
%{package_libdir}/libboost_numpy-py3.so
|
||||
|
||||
%endif
|
||||
%endif
|
||||
%endif
|
||||
|
||||
|
3
boost_1_85_0.tar.bz2
Normal file
3
boost_1_85_0.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:7009fe1faa1697476bdc7027703a2badb84e849b7b0baad5086b087b971f8617
|
||||
size 124015250
|
3
boost_1_86_0.tar.bz2
Normal file
3
boost_1_86_0.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:1bed88e40401b2cb7a1f76d4bab499e352fa4d0c5f31c0dbae64e24d34d7513b
|
||||
size 126220652
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:af57be25cb4c4f4b413ed692fe378affb4352ea50fbe294a11ef548f4d527d89
|
||||
size 131473200
|
@ -34,10 +34,10 @@ Index: boost_1_80_0/libs/chrono/build/Jamfile.v2
|
||||
<link>shared:<define>BOOST_CHRONO_DYN_LINK=1
|
||||
- <link>static:<define>BOOST_CHRONO_STATIC_LINK=1
|
||||
+ # <link>static:<define>BOOST_CHRONO_STATIC_LINK=1
|
||||
<define>BOOST_CHRONO_NO_LIB=1
|
||||
<toolset>gcc-3.4.4:<linkflags>--enable-auto-import
|
||||
<toolset>gcc-4.3.4:<linkflags>--enable-auto-import
|
||||
@@ -104,6 +104,6 @@ lib boost_chrono
|
||||
<toolset>gcc-4.4.0,<target-os>windows:<linkflags>--enable-auto-import
|
||||
@@ -104,8 +104,8 @@ lib boost_chrono
|
||||
: $(SOURCES).cpp
|
||||
:
|
||||
$(cxx11-requirements)
|
||||
@ -45,43 +45,58 @@ Index: boost_1_80_0/libs/chrono/build/Jamfile.v2
|
||||
- <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
|
||||
;
|
||||
|
||||
boost-install boost_chrono ;
|
||||
Index: boost_1_80_0/libs/system/build/Jamfile.v2
|
||||
===================================================================
|
||||
--- boost_1_80_0.orig/libs/system/build/Jamfile.v2
|
||||
+++ boost_1_80_0/libs/system/build/Jamfile.v2
|
||||
@@ -11,7 +11,7 @@
|
||||
<include>../include
|
||||
<library>$(boost_dependencies)
|
||||
@@ -11,7 +11,7 @@ project boost/system
|
||||
: source-location ../src
|
||||
: usage-requirements # pass these requirement to dependents (i.e. users)
|
||||
<link>shared:<define>BOOST_SYSTEM_DYN_LINK=1
|
||||
- <link>static:<define>BOOST_SYSTEM_STATIC_LINK=1
|
||||
+ # <link>static:<define>BOOST_SYSTEM_STATIC_LINK=1
|
||||
<define>BOOST_SYSTEM_NO_LIB=1
|
||||
+# <link>static:<define>BOOST_SYSTEM_STATIC_LINK=1
|
||||
;
|
||||
|
||||
|
||||
SOURCES = error_code ;
|
||||
@@ -19,7 +19,7 @@ SOURCES = error_code ;
|
||||
lib boost_system
|
||||
: $(SOURCES).cpp
|
||||
: <link>shared:<define>BOOST_SYSTEM_DYN_LINK=1
|
||||
- <link>static:<define>BOOST_SYSTEM_STATIC_LINK=1
|
||||
+# <link>static:<define>BOOST_SYSTEM_STATIC_LINK=1
|
||||
;
|
||||
|
||||
boost-install boost_system ;
|
||||
Index: boost_1_80_0/libs/timer/build/Jamfile.v2
|
||||
===================================================================
|
||||
--- boost_1_83_0.orig/libs/timer/build/Jamfile.v2
|
||||
+++ boost_1_83_0/libs/timer/build/Jamfile.v2
|
||||
@@ -20,7 +20,7 @@
|
||||
<library>$(boost_dependencies)
|
||||
|
||||
<link>shared:<define>BOOST_TIMER_DYN_LINK=1
|
||||
- <link>static:<define>BOOST_TIMER_STATIC_LINK=1
|
||||
+ # <link>static:<define>BOOST_TIMER_STATIC_LINK=1
|
||||
|
||||
<define>BOOST_TIMER_NO_LIB=1
|
||||
@@ -15,11 +15,11 @@
|
||||
: ../src/$(SOURCES).cpp
|
||||
: # requirements
|
||||
<link>shared:<define>BOOST_TIMER_DYN_LINK=1
|
||||
- <link>static:<define>BOOST_TIMER_STATIC_LINK=1
|
||||
+# <link>static:<define>BOOST_TIMER_STATIC_LINK=1
|
||||
: # default-build
|
||||
: # usage-requirements
|
||||
<link>shared:<define>BOOST_TIMER_DYN_LINK=1
|
||||
- <link>static:<define>BOOST_TIMER_STATIC_LINK=1
|
||||
+# <link>static:<define>BOOST_TIMER_STATIC_LINK=1
|
||||
;
|
||||
|
||||
boost-install boost_timer ;
|
||||
Index: boost_1_80_0/libs/filesystem/build/Jamfile.v2
|
||||
===================================================================
|
||||
--- boost_1_80_0.orig/libs/filesystem/build/Jamfile.v2
|
||||
+++ boost_1_80_0/libs/filesystem/build/Jamfile.v2
|
||||
@@ -130,8 +130,8 @@ project boost/filesystem
|
||||
@@ -130,7 +130,7 @@ project boost/filesystem
|
||||
: source-location ../src
|
||||
: usage-requirements # pass these requirement to dependents (i.e. users)
|
||||
<link>shared:<define>BOOST_FILESYSTEM_DYN_LINK=1
|
||||
- <link>static:<define>BOOST_FILESYSTEM_STATIC_LINK=1
|
||||
+ # <link>static:<define>BOOST_FILESYSTEM_STATIC_LINK=1
|
||||
<define>BOOST_FILESYSTEM_NO_LIB=1
|
||||
+# <link>static:<define>BOOST_FILESYSTEM_STATIC_LINK=1
|
||||
;
|
||||
|
||||
SOURCES =
|
||||
|
@ -15,10 +15,10 @@ Index: boost_1_64_0/libs/mpi/build/__init__.py
|
||||
- import DLFCN as dl
|
||||
- flags = sys.getdlopenflags()
|
||||
- sys.setdlopenflags(dl.RTLD_NOW|dl.RTLD_GLOBAL)
|
||||
- from . import mpi
|
||||
- import mpi
|
||||
- sys.setdlopenflags(flags)
|
||||
-else:
|
||||
- from . import mpi
|
||||
- import mpi
|
||||
+import DLFCN as dl
|
||||
+flags = sys.getdlopenflags()
|
||||
+sys.setdlopenflags(dl.RTLD_NOW|dl.RTLD_GLOBAL)
|
||||
|
Loading…
x
Reference in New Issue
Block a user