From: Michael Nosthoff Date: Sun, 12 Sep 2021 15:36:30 +0000 (+0200) Subject: package/boost: anotate patches X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=08f935ac45589fd1ac022cf295f6db6e3b677974;p=buildroot.git package/boost: anotate patches * add changelog and Signed-off-by to patches * use correct name for patch 0002 Signed-off-by: Michael Nosthoff Signed-off-by: Yann E. MORIN --- diff --git a/package/boost/0002-math-allow-definition-of-boost_math_no_atomic_int-on-the-command-line.patch b/package/boost/0002-math-allow-definition-of-boost_math_no_atomic_int-on-the-command-line.patch new file mode 100644 index 0000000000..063491de06 --- /dev/null +++ b/package/boost/0002-math-allow-definition-of-boost_math_no_atomic_int-on-the-command-line.patch @@ -0,0 +1,52 @@ +From 32bd6197353f6ea8e5bef01f09e25c944141acfc Mon Sep 17 00:00:00 2001 +From: jzmaddock +Date: Wed, 1 Sep 2021 18:54:54 +0100 +Subject: [PATCH] Allow definition of BOOST_MATH_NO_ATOMIC_INT on the command + line. Allows us to test/emulate platforms with no atomic integers. + +[buildroot@heine.tech: + - backport from boostorg/math 32bd6197353f6ea8e5bef01f09e25c944141acfc + - alter path to match boost release +] +Signed-off-by: Michael Nosthoff +--- + boost/math/tools/atomic.hpp | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/boost/math/tools/atomic.hpp b/boost/math/tools/atomic.hpp +index cc76ed269f..e3cbf5db89 100644 +--- a/boost/math/tools/atomic.hpp ++++ b/boost/math/tools/atomic.hpp +@@ -16,27 +16,27 @@ + namespace boost { + namespace math { + namespace detail { +-#if ATOMIC_INT_LOCK_FREE == 2 ++#if (ATOMIC_INT_LOCK_FREE == 2) && !defined(BOOST_MATH_NO_ATOMIC_INT) + typedef std::atomic atomic_counter_type; + typedef std::atomic atomic_unsigned_type; + typedef int atomic_integer_type; + typedef unsigned atomic_unsigned_integer_type; +-#elif ATOMIC_SHORT_LOCK_FREE == 2 ++#elif (ATOMIC_SHORT_LOCK_FREE == 2) && !defined(BOOST_MATH_NO_ATOMIC_INT) + typedef std::atomic atomic_counter_type; + typedef std::atomic atomic_unsigned_type; + typedef short atomic_integer_type; + typedef unsigned short atomic_unsigned_type; +-#elif ATOMIC_LONG_LOCK_FREE == 2 ++#elif (ATOMIC_LONG_LOCK_FREE == 2) && !defined(BOOST_MATH_NO_ATOMIC_INT) + typedef std::atomic atomic_unsigned_integer_type; + typedef std::atomic atomic_unsigned_type; + typedef unsigned long atomic_unsigned_type; + typedef long atomic_integer_type; +-#elif ATOMIC_LLONG_LOCK_FREE == 2 ++#elif (ATOMIC_LLONG_LOCK_FREE == 2) && !defined(BOOST_MATH_NO_ATOMIC_INT) + typedef std::atomic atomic_unsigned_integer_type; + typedef std::atomic atomic_unsigned_type; + typedef long long atomic_integer_type; + typedef unsigned long long atomic_unsigned_integer_type; +-#else ++#elif !defined(BOOST_MATH_NO_ATOMIC_INT) + # define BOOST_MATH_NO_ATOMIC_INT + #endif + } // Namespace detail diff --git a/package/boost/0002-math-provide-graceful-failure-for-bernoulli-code-on-platforms-with-no-atomics.patch b/package/boost/0002-math-provide-graceful-failure-for-bernoulli-code-on-platforms-with-no-atomics.patch deleted file mode 100644 index 121355d71e..0000000000 --- a/package/boost/0002-math-provide-graceful-failure-for-bernoulli-code-on-platforms-with-no-atomics.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 32bd6197353f6ea8e5bef01f09e25c944141acfc Mon Sep 17 00:00:00 2001 -From: jzmaddock -Date: Wed, 1 Sep 2021 18:54:54 +0100 -Subject: [PATCH] Allow definition of BOOST_MATH_NO_ATOMIC_INT on the command - line. Allows us to test/emulate platforms with no atomic integers. - ---- - boost/math/tools/atomic.hpp | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/boost/math/tools/atomic.hpp b/boost/math/tools/atomic.hpp -index cc76ed269f..e3cbf5db89 100644 ---- a/boost/math/tools/atomic.hpp -+++ b/boost/math/tools/atomic.hpp -@@ -16,27 +16,27 @@ - namespace boost { - namespace math { - namespace detail { --#if ATOMIC_INT_LOCK_FREE == 2 -+#if (ATOMIC_INT_LOCK_FREE == 2) && !defined(BOOST_MATH_NO_ATOMIC_INT) - typedef std::atomic atomic_counter_type; - typedef std::atomic atomic_unsigned_type; - typedef int atomic_integer_type; - typedef unsigned atomic_unsigned_integer_type; --#elif ATOMIC_SHORT_LOCK_FREE == 2 -+#elif (ATOMIC_SHORT_LOCK_FREE == 2) && !defined(BOOST_MATH_NO_ATOMIC_INT) - typedef std::atomic atomic_counter_type; - typedef std::atomic atomic_unsigned_type; - typedef short atomic_integer_type; - typedef unsigned short atomic_unsigned_type; --#elif ATOMIC_LONG_LOCK_FREE == 2 -+#elif (ATOMIC_LONG_LOCK_FREE == 2) && !defined(BOOST_MATH_NO_ATOMIC_INT) - typedef std::atomic atomic_unsigned_integer_type; - typedef std::atomic atomic_unsigned_type; - typedef unsigned long atomic_unsigned_type; - typedef long atomic_integer_type; --#elif ATOMIC_LLONG_LOCK_FREE == 2 -+#elif (ATOMIC_LLONG_LOCK_FREE == 2) && !defined(BOOST_MATH_NO_ATOMIC_INT) - typedef std::atomic atomic_unsigned_integer_type; - typedef std::atomic atomic_unsigned_type; - typedef long long atomic_integer_type; - typedef unsigned long long atomic_unsigned_integer_type; --#else -+#elif !defined(BOOST_MATH_NO_ATOMIC_INT) - # define BOOST_MATH_NO_ATOMIC_INT - #endif - } // Namespace detail diff --git a/package/boost/0003-math-make-no-atomics-a-soft-failure-in-bernoulli_details_hpp.patch b/package/boost/0003-math-make-no-atomics-a-soft-failure-in-bernoulli_details_hpp.patch index 77f1217a3a..7e324e310c 100644 --- a/package/boost/0003-math-make-no-atomics-a-soft-failure-in-bernoulli_details_hpp.patch +++ b/package/boost/0003-math-make-no-atomics-a-soft-failure-in-bernoulli_details_hpp.patch @@ -6,6 +6,11 @@ Subject: [PATCH] Make no atomics a soft failure in bernoulli_details.hpp. bernoulli features are to be used in a no-atomics environment. Fixes https://github.com/boostorg/math/issues/673. +[buildroot@heine.tech: + - backport from boostorg/math 7d482f6ebc356e6ec455ccb5f51a23971bf6ce5b + - alter path to match boost release +] +Signed-off-by: Michael Nosthoff --- .../detail/bernoulli_details.hpp | 10 +++++++--- libs/math/test/Jamfile.v2 | 3 +++