diff options
| author | Alexander Kanavin <alex.kanavin@gmail.com> | 2021-12-15 23:40:26 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-12-17 09:56:14 +0000 |
| commit | e472325f957d4802c06404668631a27f3affd9d1 (patch) | |
| tree | a960fb0d4668f65ab161f4b372f2b1fe2df217ca /meta/recipes-support/boost | |
| parent | 542f2f0e96b2c60a3c240ee911de76db9e79988d (diff) | |
| download | poky-e472325f957d4802c06404668631a27f3affd9d1.tar.gz | |
boost: update 1.77.0 -> 1.78.0
Drop backports.
Drop 0001-fiber-libs-Define-SYS_futex-if-it-does-not-exist.patch as
it is difficult to rebase and needs to land upstream first.
(From OE-Core rev: 3f62c538b6d39fa113a695077c89c558ae8ae2e1)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/boost')
9 files changed, 50 insertions, 326 deletions
diff --git a/meta/recipes-support/boost/boost-1.77.0.inc b/meta/recipes-support/boost/boost-1.78.0.inc index 6df06e76c7..729a47b54f 100644 --- a/meta/recipes-support/boost/boost-1.77.0.inc +++ b/meta/recipes-support/boost/boost-1.78.0.inc | |||
| @@ -12,7 +12,7 @@ BOOST_MAJ = "${@"_".join(d.getVar("PV").split(".")[0:2])}" | |||
| 12 | BOOST_P = "boost_${BOOST_VER}" | 12 | BOOST_P = "boost_${BOOST_VER}" |
| 13 | 13 | ||
| 14 | SRC_URI = "https://boostorg.jfrog.io/artifactory/main/release/${PV}/source/${BOOST_P}.tar.bz2" | 14 | SRC_URI = "https://boostorg.jfrog.io/artifactory/main/release/${PV}/source/${BOOST_P}.tar.bz2" |
| 15 | SRC_URI[sha256sum] = "fc9f85fc030e233142908241af7a846e60630aa7388de9a5fafb1f3a26840854" | 15 | SRC_URI[sha256sum] = "8681f175d4bdb26c52222665793eef08490d7758529330f98d3b29dd0735bccc" |
| 16 | 16 | ||
| 17 | UPSTREAM_CHECK_URI = "http://www.boost.org/users/download/" | 17 | UPSTREAM_CHECK_URI = "http://www.boost.org/users/download/" |
| 18 | UPSTREAM_CHECK_REGEX = "release/(?P<pver>.*)/source/" | 18 | UPSTREAM_CHECK_REGEX = "release/(?P<pver>.*)/source/" |
diff --git a/meta/recipes-support/boost/boost/0001-BoostConfig.cmake-allow-searching-for-python310.patch b/meta/recipes-support/boost/boost/0001-BoostConfig.cmake-allow-searching-for-python310.patch deleted file mode 100644 index 0a9ee2cc95..0000000000 --- a/meta/recipes-support/boost/boost/0001-BoostConfig.cmake-allow-searching-for-python310.patch +++ /dev/null | |||
| @@ -1,50 +0,0 @@ | |||
| 1 | From e193f080c7d209516ac9b712fa0c50bb08026fa2 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
| 3 | Date: Tue, 19 Oct 2021 12:24:31 +0000 | ||
| 4 | Subject: [PATCH] BoostConfig.cmake: allow searching for python310 | ||
| 5 | |||
| 6 | * accept double digits in Python3_VERSION_MINOR | ||
| 7 | |||
| 8 | * if someone is using e.g.: | ||
| 9 | find_package(Python3 REQUIRED) | ||
| 10 | find_package(Boost REQUIRED python${Python3_VERSION_MAJOR}${Python3_VERSION_MINOR}) | ||
| 11 | |||
| 12 | with python-3.10 then it currently fails with: | ||
| 13 | |||
| 14 | -- Found PythonLibs: /usr/lib/libpython3.10.so (found version "3.10.0") | ||
| 15 | -- Found Python3: -native/usr/bin/python3-native/python3 (found version "3.10.0") found components: Interpreter | ||
| 16 | CMake Error at /usr/lib/cmake/Boost-1.77.0/BoostConfig.cmake:141 (find_package): | ||
| 17 | Could not find a package configuration file provided by "boost_python310" | ||
| 18 | (requested version 1.77.0) with any of the following names: | ||
| 19 | |||
| 20 | boost_python310Config.cmake | ||
| 21 | boost_python310-config.cmake | ||
| 22 | |||
| 23 | Add the installation prefix of "boost_python310" to CMAKE_PREFIX_PATH or | ||
| 24 | set "boost_python310_DIR" to a directory containing one of the above files. | ||
| 25 | If "boost_python310" provides a separate development package or SDK, be | ||
| 26 | sure it has been installed. | ||
| 27 | Call Stack (most recent call first): | ||
| 28 | /usr/lib/cmake/Boost-1.77.0/BoostConfig.cmake:258 (boost_find_component) | ||
| 29 | /usr/share/cmake-3.21/Modules/FindBoost.cmake:594 (find_package) | ||
| 30 | CMakeLists.txt:18 (find_package) | ||
| 31 | |||
| 32 | Upstream-Status: Submitted [https://github.com/boostorg/boost_install/pull/53] | ||
| 33 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
| 34 | --- | ||
| 35 | tools/boost_install/BoostConfig.cmake | 2 +- | ||
| 36 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 37 | |||
| 38 | diff --git a/tools/boost_install/BoostConfig.cmake b/tools/boost_install/BoostConfig.cmake | ||
| 39 | index fd17821..5dffa58 100644 | ||
| 40 | --- a/tools/boost_install/BoostConfig.cmake | ||
| 41 | +++ b/tools/boost_install/BoostConfig.cmake | ||
| 42 | @@ -113,7 +113,7 @@ macro(boost_find_component comp required quiet) | ||
| 43 | set(_BOOST_REQUIRED REQUIRED) | ||
| 44 | endif() | ||
| 45 | |||
| 46 | - if("${comp}" MATCHES "^(python|numpy|mpi_python)([1-9])([0-9])$") | ||
| 47 | + if("${comp}" MATCHES "^(python|numpy|mpi_python)([1-9])([0-9][0-9]?)$") | ||
| 48 | |||
| 49 | # handle pythonXY and numpyXY versioned components for compatibility | ||
| 50 | |||
diff --git a/meta/recipes-support/boost/boost/0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch b/meta/recipes-support/boost/boost/0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch index 91ab53efd9..67d5dff125 100644 --- a/meta/recipes-support/boost/boost/0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch +++ b/meta/recipes-support/boost/boost/0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From 8e1d30454afde37eaa3c593ec19d108cd5ed10d0 Mon Sep 17 00:00:00 2001 | 1 | From 4d2a8fc8117e56bc283349e5f7f889ebbfc55c71 Mon Sep 17 00:00:00 2001 |
| 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
| 3 | Date: Tue, 18 Dec 2018 15:42:57 +0100 | 3 | Date: Tue, 18 Dec 2018 15:42:57 +0100 |
| 4 | Subject: [PATCH] Don't set up arch/instruction-set flags, we do that | 4 | Subject: [PATCH] Don't set up arch/instruction-set flags, we do that |
| @@ -10,14 +10,14 @@ Signed-off-by: Christopher Larson <chris_larson@mentor.com> | |||
| 10 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 10 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
| 11 | 11 | ||
| 12 | --- | 12 | --- |
| 13 | tools/build/src/tools/gcc.jam | 139 ---------------------------------- | 13 | tools/build/src/tools/gcc.jam | 144 ---------------------------------- |
| 14 | 1 file changed, 139 deletions(-) | 14 | 1 file changed, 144 deletions(-) |
| 15 | 15 | ||
| 16 | diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam | 16 | diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam |
| 17 | index ff3209f7b..70cbc39a5 100644 | 17 | index 47a113223..d77525724 100644 |
| 18 | --- a/tools/build/src/tools/gcc.jam | 18 | --- a/tools/build/src/tools/gcc.jam |
| 19 | +++ b/tools/build/src/tools/gcc.jam | 19 | +++ b/tools/build/src/tools/gcc.jam |
| 20 | @@ -1217,142 +1217,3 @@ local rule cpu-flags ( toolset variable : architecture : instruction-set + : | 20 | @@ -1122,147 +1122,3 @@ local rule cpu-flags ( toolset variable : architecture : instruction-set + : |
| 21 | <architecture>$(architecture)/<instruction-set>$(instruction-set) | 21 | <architecture>$(architecture)/<instruction-set>$(instruction-set) |
| 22 | : $(values) ; | 22 | : $(values) ; |
| 23 | } | 23 | } |
| @@ -158,5 +158,10 @@ index ff3209f7b..70cbc39a5 100644 | |||
| 158 | -cpu-flags gcc OPTIONS : s390x : z13 : -march=z13 ; | 158 | -cpu-flags gcc OPTIONS : s390x : z13 : -march=z13 ; |
| 159 | -cpu-flags gcc OPTIONS : s390x : z14 : -march=z14 ; | 159 | -cpu-flags gcc OPTIONS : s390x : z14 : -march=z14 ; |
| 160 | -cpu-flags gcc OPTIONS : s390x : z15 : -march=z15 ; | 160 | -cpu-flags gcc OPTIONS : s390x : z15 : -march=z15 ; |
| 161 | -# ARM | ||
| 162 | -cpu-flags gcc OPTIONS : arm : cortex-a9+vfpv3 : -mcpu=cortex-a9 -mfpu=vfpv3 -mfloat-abi=hard ; | ||
| 163 | -cpu-flags gcc OPTIONS : arm : cortex-a53 : -mcpu=cortex-a53 ; | ||
| 164 | -cpu-flags gcc OPTIONS : arm : cortex-r5 : -mcpu=cortex-r5 ; | ||
| 165 | -cpu-flags gcc OPTIONS : arm : cortex-r5+vfpv3-d16 : -mcpu=cortex-r5 -mfpu=vfpv3-d16 -mfloat-abi=hard ; | ||
| 161 | -# AIX variant of RS/6000 & PowerPC | 166 | -# AIX variant of RS/6000 & PowerPC |
| 162 | -toolset.flags gcc AROPTIONS <address-model>64/<target-os>aix : "-X64" ; | 167 | -toolset.flags gcc AROPTIONS <address-model>64/<target-os>aix : "-X64" ; |
diff --git a/meta/recipes-support/boost/boost/0001-fiber-libs-Define-SYS_futex-if-it-does-not-exist.patch b/meta/recipes-support/boost/boost/0001-fiber-libs-Define-SYS_futex-if-it-does-not-exist.patch deleted file mode 100644 index 523568e9bc..0000000000 --- a/meta/recipes-support/boost/boost/0001-fiber-libs-Define-SYS_futex-if-it-does-not-exist.patch +++ /dev/null | |||
| @@ -1,54 +0,0 @@ | |||
| 1 | From d6f7b6064dc91d1d5fa18554b40b14822ab7a32b Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Fri, 16 Oct 2020 11:13:22 -0700 | ||
| 4 | Subject: [PATCH] fiber,libs: Define SYS_futex if it does not exist | ||
| 5 | |||
| 6 | __NR_futex is not defines by newer architectures e.g. arc, riscv32 as | ||
| 7 | they only have 64bit variant of time_t. Glibc defines SYS_futex interface based on | ||
| 8 | __NR_futex, since this is used in applications, such applications start | ||
| 9 | to fail to build for these newer architectures. This patch defines a | ||
| 10 | fallback to alias __NR_futex to __NR_futex_tim64 so SYS_futex keeps | ||
| 11 | working | ||
| 12 | |||
| 13 | Upstream-Status: Pending | ||
| 14 | |||
| 15 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 16 | --- | ||
| 17 | boost/fiber/detail/futex.hpp | 5 +++++ | ||
| 18 | libs/log/src/event.cpp | 4 ++++ | ||
| 19 | 2 files changed, 9 insertions(+) | ||
| 20 | |||
| 21 | diff --git a/boost/fiber/detail/futex.hpp b/boost/fiber/detail/futex.hpp | ||
| 22 | index e64bd5990..16bee64f1 100644 | ||
| 23 | --- a/boost/fiber/detail/futex.hpp | ||
| 24 | +++ b/boost/fiber/detail/futex.hpp | ||
| 25 | @@ -17,6 +17,11 @@ extern "C" { | ||
| 26 | #include <linux/futex.h> | ||
| 27 | #include <sys/syscall.h> | ||
| 28 | } | ||
| 29 | + | ||
| 30 | +#if !defined(SYS_futex) && defined(SYS_futex_time64) | ||
| 31 | +#define SYS_futex SYS_futex_time64 | ||
| 32 | +#endif | ||
| 33 | + | ||
| 34 | #elif BOOST_OS_WINDOWS | ||
| 35 | #include <windows.h> | ||
| 36 | #endif | ||
| 37 | diff --git a/libs/log/src/event.cpp b/libs/log/src/event.cpp | ||
| 38 | index 5485154d7..2c7c0381f 100644 | ||
| 39 | --- a/libs/log/src/event.cpp | ||
| 40 | +++ b/libs/log/src/event.cpp | ||
| 41 | @@ -31,6 +31,10 @@ | ||
| 42 | #include <linux/futex.h> | ||
| 43 | #include <boost/memory_order.hpp> | ||
| 44 | |||
| 45 | +#if !defined(SYS_futex) && defined(SYS_futex_time64) | ||
| 46 | +#define SYS_futex SYS_futex_time64 | ||
| 47 | +#endif | ||
| 48 | + | ||
| 49 | // Some Android NDKs (Google NDK and older Crystax.NET NDK versions) don't define SYS_futex | ||
| 50 | #if defined(SYS_futex) | ||
| 51 | #define BOOST_LOG_SYS_FUTEX SYS_futex | ||
| 52 | -- | ||
| 53 | 2.28.0 | ||
| 54 | |||
diff --git a/meta/recipes-support/boost/boost/0002-math-allow-definition-of-boost_math_no_atomic_int-on-the-command-line.patch b/meta/recipes-support/boost/boost/0002-math-allow-definition-of-boost_math_no_atomic_int-on-the-command-line.patch deleted file mode 100644 index b05b795084..0000000000 --- a/meta/recipes-support/boost/boost/0002-math-allow-definition-of-boost_math_no_atomic_int-on-the-command-line.patch +++ /dev/null | |||
| @@ -1,53 +0,0 @@ | |||
| 1 | From 32bd6197353f6ea8e5bef01f09e25c944141acfc Mon Sep 17 00:00:00 2001 | ||
| 2 | From: jzmaddock <john@johnmaddock.co.uk> | ||
| 3 | Date: Wed, 1 Sep 2021 18:54:54 +0100 | ||
| 4 | Subject: [PATCH] Allow definition of BOOST_MATH_NO_ATOMIC_INT on the command | ||
| 5 | line. Allows us to test/emulate platforms with no atomic integers. | ||
| 6 | |||
| 7 | [buildroot@heine.tech: | ||
| 8 | - backport from boostorg/math 32bd6197353f6ea8e5bef01f09e25c944141acfc | ||
| 9 | - alter path to match boost release | ||
| 10 | ] | ||
| 11 | Signed-off-by: Michael Nosthoff <buildroot@heine.tech> | ||
| 12 | --- | ||
| 13 | Upstream-Status: Backport [https://github.com/boostorg/math/pull/684/commits/32bd6197353f6ea8e5bef01f09e25c944141acfc] | ||
| 14 | boost/math/tools/atomic.hpp | 10 +++++----- | ||
| 15 | 1 file changed, 5 insertions(+), 5 deletions(-) | ||
| 16 | |||
| 17 | diff --git a/boost/math/tools/atomic.hpp b/boost/math/tools/atomic.hpp | ||
| 18 | index cc76ed269f..e3cbf5db89 100644 | ||
| 19 | --- a/boost/math/tools/atomic.hpp | ||
| 20 | +++ b/boost/math/tools/atomic.hpp | ||
| 21 | @@ -16,27 +16,27 @@ | ||
| 22 | namespace boost { | ||
| 23 | namespace math { | ||
| 24 | namespace detail { | ||
| 25 | -#if ATOMIC_INT_LOCK_FREE == 2 | ||
| 26 | +#if (ATOMIC_INT_LOCK_FREE == 2) && !defined(BOOST_MATH_NO_ATOMIC_INT) | ||
| 27 | typedef std::atomic<int> atomic_counter_type; | ||
| 28 | typedef std::atomic<unsigned> atomic_unsigned_type; | ||
| 29 | typedef int atomic_integer_type; | ||
| 30 | typedef unsigned atomic_unsigned_integer_type; | ||
| 31 | -#elif ATOMIC_SHORT_LOCK_FREE == 2 | ||
| 32 | +#elif (ATOMIC_SHORT_LOCK_FREE == 2) && !defined(BOOST_MATH_NO_ATOMIC_INT) | ||
| 33 | typedef std::atomic<short> atomic_counter_type; | ||
| 34 | typedef std::atomic<unsigned short> atomic_unsigned_type; | ||
| 35 | typedef short atomic_integer_type; | ||
| 36 | typedef unsigned short atomic_unsigned_type; | ||
| 37 | -#elif ATOMIC_LONG_LOCK_FREE == 2 | ||
| 38 | +#elif (ATOMIC_LONG_LOCK_FREE == 2) && !defined(BOOST_MATH_NO_ATOMIC_INT) | ||
| 39 | typedef std::atomic<long> atomic_unsigned_integer_type; | ||
| 40 | typedef std::atomic<unsigned long> atomic_unsigned_type; | ||
| 41 | typedef unsigned long atomic_unsigned_type; | ||
| 42 | typedef long atomic_integer_type; | ||
| 43 | -#elif ATOMIC_LLONG_LOCK_FREE == 2 | ||
| 44 | +#elif (ATOMIC_LLONG_LOCK_FREE == 2) && !defined(BOOST_MATH_NO_ATOMIC_INT) | ||
| 45 | typedef std::atomic<long long> atomic_unsigned_integer_type; | ||
| 46 | typedef std::atomic<unsigned long long> atomic_unsigned_type; | ||
| 47 | typedef long long atomic_integer_type; | ||
| 48 | typedef unsigned long long atomic_unsigned_integer_type; | ||
| 49 | -#else | ||
| 50 | +#elif !defined(BOOST_MATH_NO_ATOMIC_INT) | ||
| 51 | # define BOOST_MATH_NO_ATOMIC_INT | ||
| 52 | #endif | ||
| 53 | } // Namespace detail | ||
diff --git a/meta/recipes-support/boost/boost/0003-math-make-no-atomics-a-soft-failure-in-bernoulli_details_hpp.patch b/meta/recipes-support/boost/boost/0003-math-make-no-atomics-a-soft-failure-in-bernoulli_details_hpp.patch deleted file mode 100644 index f69e4f21f3..0000000000 --- a/meta/recipes-support/boost/boost/0003-math-make-no-atomics-a-soft-failure-in-bernoulli_details_hpp.patch +++ /dev/null | |||
| @@ -1,151 +0,0 @@ | |||
| 1 | From 7d482f6ebc356e6ec455ccb5f51a23971bf6ce5b Mon Sep 17 00:00:00 2001 | ||
| 2 | From: jzmaddock <john@johnmaddock.co.uk> | ||
| 3 | Date: Wed, 1 Sep 2021 20:31:53 +0100 | ||
| 4 | Subject: [PATCH] Make no atomics a soft failure in bernoulli_details.hpp. | ||
| 5 | Include an "escape macro" so thread safety can be disabled if certain | ||
| 6 | bernoulli features are to be used in a no-atomics environment. Fixes | ||
| 7 | https://github.com/boostorg/math/issues/673. | ||
| 8 | |||
| 9 | [buildroot@heine.tech: | ||
| 10 | - backport from boostorg/math 7d482f6ebc356e6ec455ccb5f51a23971bf6ce5b | ||
| 11 | - alter path to match boost release | ||
| 12 | ] | ||
| 13 | Signed-off-by: Michael Nosthoff <buildroot@heine.tech> | ||
| 14 | --- | ||
| 15 | Upstream-Status: Backport [https://github.com/boostorg/math/pull/684/commits/7d482f6ebc356e6ec455ccb5f51a23971bf6ce5b] | ||
| 16 | .../detail/bernoulli_details.hpp | 10 +++++++--- | ||
| 17 | libs/math/test/Jamfile.v2 | 3 +++ | ||
| 18 | test/compile_test/bernoulli_no_atomic_d.cpp | 14 ++++++++++++++ | ||
| 19 | test/compile_test/bernoulli_no_atomic_fail.cpp | 15 +++++++++++++++ | ||
| 20 | test/compile_test/bernoulli_no_atomic_mp.cpp | 16 ++++++++++++++++ | ||
| 21 | 5 files changed, 55 insertions(+), 3 deletions(-) | ||
| 22 | create mode 100644 test/compile_test/bernoulli_no_atomic_d.cpp | ||
| 23 | create mode 100644 test/compile_test/bernoulli_no_atomic_fail.cpp | ||
| 24 | create mode 100644 test/compile_test/bernoulli_no_atomic_mp.cpp | ||
| 25 | |||
| 26 | diff --git a/boost/math/special_functions/detail/bernoulli_details.hpp b/boost/math/special_functions/detail/bernoulli_details.hpp | ||
| 27 | index cf35545264..8519b7c89c 100644 | ||
| 28 | --- a/boost/math/special_functions/detail/bernoulli_details.hpp | ||
| 29 | +++ b/boost/math/special_functions/detail/bernoulli_details.hpp | ||
| 30 | @@ -360,7 +360,7 @@ class bernoulli_numbers_cache | ||
| 31 | return out; | ||
| 32 | } | ||
| 33 | |||
| 34 | - #ifndef BOOST_HAS_THREADS | ||
| 35 | + #if !defined(BOOST_HAS_THREADS) || defined(BOOST_MATH_BERNOULLI_UNTHREADED) | ||
| 36 | // | ||
| 37 | // Single threaded code, very simple: | ||
| 38 | // | ||
| 39 | @@ -382,6 +382,8 @@ class bernoulli_numbers_cache | ||
| 40 | *out = (i >= m_overflow_limit) ? policies::raise_overflow_error<T>("boost::math::bernoulli_b2n<%1%>(std::size_t)", 0, T(i), pol) : bn[i]; | ||
| 41 | ++out; | ||
| 42 | } | ||
| 43 | + #elif defined(BOOST_MATH_NO_ATOMIC_INT) | ||
| 44 | + static_assert(sizeof(T) == 1, "Unsupported configuration: your platform appears to have no atomic integers. If you are happy with thread-unsafe code, then you may define BOOST_MATH_BERNOULLI_UNTHREADED to suppress this error."); | ||
| 45 | #else | ||
| 46 | // | ||
| 47 | // Double-checked locking pattern, lets us access cached already cached values | ||
| 48 | @@ -464,7 +466,7 @@ class bernoulli_numbers_cache | ||
| 49 | return out; | ||
| 50 | } | ||
| 51 | |||
| 52 | - #ifndef BOOST_HAS_THREADS | ||
| 53 | + #if !defined(BOOST_HAS_THREADS) || defined(BOOST_MATH_BERNOULLI_UNTHREADED) | ||
| 54 | // | ||
| 55 | // Single threaded code, very simple: | ||
| 56 | // | ||
| 57 | @@ -494,6 +496,8 @@ class bernoulli_numbers_cache | ||
| 58 | } | ||
| 59 | ++out; | ||
| 60 | } | ||
| 61 | + #elif defined(BOOST_MATH_NO_ATOMIC_INT) | ||
| 62 | + static_assert(sizeof(T) == 1, "Unsupported configuration: your platform appears to have no atomic integers. If you are happy with thread-unsafe code, then you may define BOOST_MATH_BERNOULLI_UNTHREADED to suppress this error."); | ||
| 63 | #else | ||
| 64 | // | ||
| 65 | // Double-checked locking pattern, lets us access cached already cached values | ||
| 66 | @@ -555,7 +559,7 @@ class bernoulli_numbers_cache | ||
| 67 | // The value at which we know overflow has already occurred for the Bn: | ||
| 68 | std::size_t m_overflow_limit; | ||
| 69 | |||
| 70 | - #ifdef BOOST_HAS_THREADS | ||
| 71 | + #if defined(BOOST_HAS_THREADS) && !defined(BOOST_MATH_NO_ATOMIC_INT) | ||
| 72 | std::mutex m_mutex; | ||
| 73 | atomic_counter_type m_counter, m_current_precision; | ||
| 74 | #else | ||
| 75 | diff --git a/libs/math/test/Jamfile.v2 b/libs/math/test/Jamfile.v2 | ||
| 76 | index 52fb87f5e5..3ac63f9279 100644 | ||
| 77 | --- a/libs/math/test/Jamfile.v2 | ||
| 78 | +++ b/libs/math/test/Jamfile.v2 | ||
| 79 | @@ -1137,6 +1137,9 @@ test-suite misc : | ||
| 80 | |||
| 81 | # [ run __temporary_test.cpp test_instances//test_instances : : : <test-info>always_show_run_output <pch>off ] | ||
| 82 | [ compile test_no_long_double_policy.cpp ] | ||
| 83 | + [ compile compile_test/bernoulli_no_atomic_d.cpp ] | ||
| 84 | + [ compile compile_test/bernoulli_no_atomic_mp.cpp ] | ||
| 85 | + [ compile-fail compile_test/bernoulli_no_atomic_fail.cpp ] | ||
| 86 | ; | ||
| 87 | |||
| 88 | test-suite interpolators : | ||
| 89 | diff --git a/test/compile_test/bernoulli_no_atomic_d.cpp b/test/compile_test/bernoulli_no_atomic_d.cpp | ||
| 90 | new file mode 100644 | ||
| 91 | index 0000000000..61926f7e1f | ||
| 92 | --- /dev/null | ||
| 93 | +++ b/test/compile_test/bernoulli_no_atomic_d.cpp | ||
| 94 | @@ -0,0 +1,14 @@ | ||
| 95 | +// (C) Copyright John Maddock 2021. | ||
| 96 | +// Use, modification and distribution are subject to the | ||
| 97 | +// Boost Software License, Version 1.0. (See accompanying file | ||
| 98 | +// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) | ||
| 99 | + | ||
| 100 | +#define BOOST_MATH_NO_ATOMIC_INT | ||
| 101 | + | ||
| 102 | +#include <boost/math/special_functions/bernoulli.hpp> | ||
| 103 | +#include "test_compile_result.hpp" | ||
| 104 | + | ||
| 105 | +void compile_and_link_test() | ||
| 106 | +{ | ||
| 107 | + check_result<double>(boost::math::bernoulli_b2n<double>(4)); | ||
| 108 | +} | ||
| 109 | diff --git a/test/compile_test/bernoulli_no_atomic_fail.cpp b/test/compile_test/bernoulli_no_atomic_fail.cpp | ||
| 110 | new file mode 100644 | ||
| 111 | index 0000000000..bbd7152412 | ||
| 112 | --- /dev/null | ||
| 113 | +++ b/test/compile_test/bernoulli_no_atomic_fail.cpp | ||
| 114 | @@ -0,0 +1,15 @@ | ||
| 115 | +// (C) Copyright John Maddock 2021. | ||
| 116 | +// Use, modification and distribution are subject to the | ||
| 117 | +// Boost Software License, Version 1.0. (See accompanying file | ||
| 118 | +// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) | ||
| 119 | + | ||
| 120 | +#define BOOST_MATH_NO_ATOMIC_INT | ||
| 121 | + | ||
| 122 | +#include <boost/math/special_functions/bernoulli.hpp> | ||
| 123 | +#include <boost/multiprecision/cpp_bin_float.hpp> | ||
| 124 | +#include "test_compile_result.hpp" | ||
| 125 | + | ||
| 126 | +void compile_and_link_test() | ||
| 127 | +{ | ||
| 128 | + check_result<boost::multiprecision::cpp_bin_float_50>(boost::math::bernoulli_b2n<boost::multiprecision::cpp_bin_float_50>(4)); | ||
| 129 | +} | ||
| 130 | diff --git a/test/compile_test/bernoulli_no_atomic_mp.cpp b/test/compile_test/bernoulli_no_atomic_mp.cpp | ||
| 131 | new file mode 100644 | ||
| 132 | index 0000000000..8d5a6e78e6 | ||
| 133 | --- /dev/null | ||
| 134 | +++ b/test/compile_test/bernoulli_no_atomic_mp.cpp | ||
| 135 | @@ -0,0 +1,16 @@ | ||
| 136 | +// (C) Copyright John Maddock 2021. | ||
| 137 | +// Use, modification and distribution are subject to the | ||
| 138 | +// Boost Software License, Version 1.0. (See accompanying file | ||
| 139 | +// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) | ||
| 140 | + | ||
| 141 | +#define BOOST_MATH_NO_ATOMIC_INT | ||
| 142 | +#define BOOST_MATH_BERNOULLI_UNTHREADED | ||
| 143 | + | ||
| 144 | +#include <boost/math/special_functions/bernoulli.hpp> | ||
| 145 | +#include <boost/multiprecision/cpp_bin_float.hpp> | ||
| 146 | +#include "test_compile_result.hpp" | ||
| 147 | + | ||
| 148 | +void compile_and_link_test() | ||
| 149 | +{ | ||
| 150 | + check_result<boost::multiprecision::cpp_bin_float_50>(boost::math::bernoulli_b2n<boost::multiprecision::cpp_bin_float_50>(4)); | ||
| 151 | +} | ||
diff --git a/meta/recipes-support/boost/boost/de657e01635306085488290ea83de541ec393f8b.patch b/meta/recipes-support/boost/boost/de657e01635306085488290ea83de541ec393f8b.patch new file mode 100644 index 0000000000..867ec03ba6 --- /dev/null +++ b/meta/recipes-support/boost/boost/de657e01635306085488290ea83de541ec393f8b.patch | |||
| @@ -0,0 +1,30 @@ | |||
| 1 | From de657e01635306085488290ea83de541ec393f8b Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Leonardo Neumann <leonardo@neumann.dev.br> | ||
| 3 | Date: Mon, 13 Dec 2021 01:07:20 -0300 | ||
| 4 | Subject: [PATCH] Fix missing sys/stat.h include on musl-based systems | ||
| 5 | |||
| 6 | Boost 1.78.0 fails to build on musl-based systems because musl does | ||
| 7 | not include sys/stat.h by default. | ||
| 8 | |||
| 9 | Fixes #161 ("Boost compiler error") | ||
| 10 | Upstream-Status: Submitted [https://github.com/boostorg/interprocess/pull/162] | ||
| 11 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
| 12 | --- | ||
| 13 | include/boost/interprocess/permissions.hpp | 4 ++++ | ||
| 14 | 1 file changed, 4 insertions(+) | ||
| 15 | |||
| 16 | diff --git a/boost/interprocess/permissions.hpp b/boost/interprocess/permissions.hpp | ||
| 17 | index ab55411e..0b21a685 100644 | ||
| 18 | --- a/boost/interprocess/permissions.hpp | ||
| 19 | +++ b/boost/interprocess/permissions.hpp | ||
| 20 | @@ -29,6 +29,10 @@ | ||
| 21 | |||
| 22 | #include <boost/interprocess/detail/win32_api.hpp> | ||
| 23 | |||
| 24 | +#else | ||
| 25 | + | ||
| 26 | +#include <sys/stat.h> | ||
| 27 | + | ||
| 28 | #endif | ||
| 29 | |||
| 30 | #endif //#ifndef BOOST_INTERPROCESS_DOXYGEN_INVOKED | ||
diff --git a/meta/recipes-support/boost/boost_1.77.0.bb b/meta/recipes-support/boost/boost_1.77.0.bb deleted file mode 100644 index bde6b14a79..0000000000 --- a/meta/recipes-support/boost/boost_1.77.0.bb +++ /dev/null | |||
| @@ -1,12 +0,0 @@ | |||
| 1 | require boost-${PV}.inc | ||
| 2 | require boost.inc | ||
| 3 | |||
| 4 | SRC_URI += "file://boost-CVE-2012-2677.patch \ | ||
| 5 | file://boost-math-disable-pch-for-gcc.patch \ | ||
| 6 | file://0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch \ | ||
| 7 | file://0001-dont-setup-compiler-flags-m32-m64.patch \ | ||
| 8 | file://0001-fiber-libs-Define-SYS_futex-if-it-does-not-exist.patch \ | ||
| 9 | file://0001-BoostConfig.cmake-allow-searching-for-python310.patch \ | ||
| 10 | file://0002-math-allow-definition-of-boost_math_no_atomic_int-on-the-command-line.patch \ | ||
| 11 | file://0003-math-make-no-atomics-a-soft-failure-in-bernoulli_details_hpp.patch \ | ||
| 12 | " | ||
diff --git a/meta/recipes-support/boost/boost_1.78.0.bb b/meta/recipes-support/boost/boost_1.78.0.bb new file mode 100644 index 0000000000..f4b6ed8576 --- /dev/null +++ b/meta/recipes-support/boost/boost_1.78.0.bb | |||
| @@ -0,0 +1,9 @@ | |||
| 1 | require boost-${PV}.inc | ||
| 2 | require boost.inc | ||
| 3 | |||
| 4 | SRC_URI += "file://boost-CVE-2012-2677.patch \ | ||
| 5 | file://boost-math-disable-pch-for-gcc.patch \ | ||
| 6 | file://0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch \ | ||
| 7 | file://0001-dont-setup-compiler-flags-m32-m64.patch \ | ||
| 8 | file://de657e01635306085488290ea83de541ec393f8b.patch \ | ||
| 9 | " | ||
