From ebef6189141c0070730fce46c1305c030d4cad44 Mon Sep 17 00:00:00 2001 From: Michael Nosthoff Date: Thu, 16 Dec 2021 13:42:13 +0100 Subject: [PATCH] package/boost: bump to version 1.78.0 * drop all upstreamed patches Signed-off-by: Michael Nosthoff Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .../boost/0001-added-missing-brackets.patch | 29 ---- ...th_no_atomic_int-on-the-command-line.patch | 52 ------ ...oft-failure-in-bernoulli_details_hpp.patch | 150 ------------------ package/boost/boost.hash | 4 +- package/boost/boost.mk | 2 +- 5 files changed, 3 insertions(+), 234 deletions(-) delete mode 100644 package/boost/0001-added-missing-brackets.patch delete mode 100644 package/boost/0002-math-allow-definition-of-boost_math_no_atomic_int-on-the-command-line.patch delete mode 100644 package/boost/0003-math-make-no-atomics-a-soft-failure-in-bernoulli_details_hpp.patch diff --git a/package/boost/0001-added-missing-brackets.patch b/package/boost/0001-added-missing-brackets.patch deleted file mode 100644 index 1a2d5e67ec..0000000000 --- a/package/boost/0001-added-missing-brackets.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 1be0e4a2d8db15a405f64a6f65507b87c1be7e1a Mon Sep 17 00:00:00 2001 -From: tkoecker -Date: Fri, 21 May 2021 16:31:11 +0200 -Subject: [PATCH] added missing brackets (#118) - -[Retrieved from: -https://github.com/boostorg/predef/commit/1be0e4a2d8db15a405f64a6f65507b87c1be7e1a] -Signed-off-by: Fabrice Fontaine ---- - include/boost/predef/architecture/sparc.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/boost/predef/architecture/sparc.h b/boost/predef/architecture/sparc.h -index d7b94f0..d01605e 100644 ---- a/boost/predef/architecture/sparc.h -+++ b//boost/predef/architecture/sparc.h -@@ -34,10 +34,10 @@ Distributed under the Boost Software License, Version 1.0. - - #if defined(__sparc__) || defined(__sparc) - # undef BOOST_ARCH_SPARC --# if !defined(BOOST_ARCH_SPARC) && (defined(__sparcv9) || defined(__sparc_v9__) -+# if !defined(BOOST_ARCH_SPARC) && (defined(__sparcv9) || defined(__sparc_v9__)) - # define BOOST_ARCH_SPARC BOOST_VERSION_NUMBER(9,0,0) - # endif --# if !defined(BOOST_ARCH_SPARC) && (defined(__sparcv8) || defined(__sparc_v8__) -+# if !defined(BOOST_ARCH_SPARC) && (defined(__sparcv8) || defined(__sparc_v8__)) - # define BOOST_ARCH_SPARC BOOST_VERSION_NUMBER(8,0,0) - # endif - # if !defined(BOOST_ARCH_SPARC) 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 deleted file mode 100644 index 063491de06..0000000000 --- a/package/boost/0002-math-allow-definition-of-boost_math_no_atomic_int-on-the-command-line.patch +++ /dev/null @@ -1,52 +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. - -[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/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 deleted file mode 100644 index 7e324e310c..0000000000 --- a/package/boost/0003-math-make-no-atomics-a-soft-failure-in-bernoulli_details_hpp.patch +++ /dev/null @@ -1,150 +0,0 @@ -From 7d482f6ebc356e6ec455ccb5f51a23971bf6ce5b Mon Sep 17 00:00:00 2001 -From: jzmaddock -Date: Wed, 1 Sep 2021 20:31:53 +0100 -Subject: [PATCH] Make no atomics a soft failure in bernoulli_details.hpp. - Include an "escape macro" so thread safety can be disabled if certain - 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 +++ - test/compile_test/bernoulli_no_atomic_d.cpp | 14 ++++++++++++++ - test/compile_test/bernoulli_no_atomic_fail.cpp | 15 +++++++++++++++ - test/compile_test/bernoulli_no_atomic_mp.cpp | 16 ++++++++++++++++ - 5 files changed, 55 insertions(+), 3 deletions(-) - create mode 100644 test/compile_test/bernoulli_no_atomic_d.cpp - create mode 100644 test/compile_test/bernoulli_no_atomic_fail.cpp - create mode 100644 test/compile_test/bernoulli_no_atomic_mp.cpp - -diff --git a/boost/math/special_functions/detail/bernoulli_details.hpp b/boost/math/special_functions/detail/bernoulli_details.hpp -index cf35545264..8519b7c89c 100644 ---- a/boost/math/special_functions/detail/bernoulli_details.hpp -+++ b/boost/math/special_functions/detail/bernoulli_details.hpp -@@ -360,7 +360,7 @@ class bernoulli_numbers_cache - return out; - } - -- #ifndef BOOST_HAS_THREADS -+ #if !defined(BOOST_HAS_THREADS) || defined(BOOST_MATH_BERNOULLI_UNTHREADED) - // - // Single threaded code, very simple: - // -@@ -382,6 +382,8 @@ class bernoulli_numbers_cache - *out = (i >= m_overflow_limit) ? policies::raise_overflow_error("boost::math::bernoulli_b2n<%1%>(std::size_t)", 0, T(i), pol) : bn[i]; - ++out; - } -+ #elif defined(BOOST_MATH_NO_ATOMIC_INT) -+ 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."); - #else - // - // Double-checked locking pattern, lets us access cached already cached values -@@ -464,7 +466,7 @@ class bernoulli_numbers_cache - return out; - } - -- #ifndef BOOST_HAS_THREADS -+ #if !defined(BOOST_HAS_THREADS) || defined(BOOST_MATH_BERNOULLI_UNTHREADED) - // - // Single threaded code, very simple: - // -@@ -494,6 +496,8 @@ class bernoulli_numbers_cache - } - ++out; - } -+ #elif defined(BOOST_MATH_NO_ATOMIC_INT) -+ 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."); - #else - // - // Double-checked locking pattern, lets us access cached already cached values -@@ -555,7 +559,7 @@ class bernoulli_numbers_cache - // The value at which we know overflow has already occurred for the Bn: - std::size_t m_overflow_limit; - -- #ifdef BOOST_HAS_THREADS -+ #if defined(BOOST_HAS_THREADS) && !defined(BOOST_MATH_NO_ATOMIC_INT) - std::mutex m_mutex; - atomic_counter_type m_counter, m_current_precision; - #else -diff --git a/libs/math/test/Jamfile.v2 b/libs/math/test/Jamfile.v2 -index 52fb87f5e5..3ac63f9279 100644 ---- a/libs/math/test/Jamfile.v2 -+++ b/libs/math/test/Jamfile.v2 -@@ -1137,6 +1137,9 @@ test-suite misc : - - # [ run __temporary_test.cpp test_instances//test_instances : : : always_show_run_output off ] - [ compile test_no_long_double_policy.cpp ] -+ [ compile compile_test/bernoulli_no_atomic_d.cpp ] -+ [ compile compile_test/bernoulli_no_atomic_mp.cpp ] -+ [ compile-fail compile_test/bernoulli_no_atomic_fail.cpp ] - ; - - test-suite interpolators : -diff --git a/test/compile_test/bernoulli_no_atomic_d.cpp b/test/compile_test/bernoulli_no_atomic_d.cpp -new file mode 100644 -index 0000000000..61926f7e1f ---- /dev/null -+++ b/test/compile_test/bernoulli_no_atomic_d.cpp -@@ -0,0 +1,14 @@ -+// (C) Copyright John Maddock 2021. -+// Use, modification and distribution are subject to the -+// Boost Software License, Version 1.0. (See accompanying file -+// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -+ -+#define BOOST_MATH_NO_ATOMIC_INT -+ -+#include -+#include "test_compile_result.hpp" -+ -+void compile_and_link_test() -+{ -+ check_result(boost::math::bernoulli_b2n(4)); -+} -diff --git a/test/compile_test/bernoulli_no_atomic_fail.cpp b/test/compile_test/bernoulli_no_atomic_fail.cpp -new file mode 100644 -index 0000000000..bbd7152412 ---- /dev/null -+++ b/test/compile_test/bernoulli_no_atomic_fail.cpp -@@ -0,0 +1,15 @@ -+// (C) Copyright John Maddock 2021. -+// Use, modification and distribution are subject to the -+// Boost Software License, Version 1.0. (See accompanying file -+// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -+ -+#define BOOST_MATH_NO_ATOMIC_INT -+ -+#include -+#include -+#include "test_compile_result.hpp" -+ -+void compile_and_link_test() -+{ -+ check_result(boost::math::bernoulli_b2n(4)); -+} -diff --git a/test/compile_test/bernoulli_no_atomic_mp.cpp b/test/compile_test/bernoulli_no_atomic_mp.cpp -new file mode 100644 -index 0000000000..8d5a6e78e6 ---- /dev/null -+++ b/test/compile_test/bernoulli_no_atomic_mp.cpp -@@ -0,0 +1,16 @@ -+// (C) Copyright John Maddock 2021. -+// Use, modification and distribution are subject to the -+// Boost Software License, Version 1.0. (See accompanying file -+// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -+ -+#define BOOST_MATH_NO_ATOMIC_INT -+#define BOOST_MATH_BERNOULLI_UNTHREADED -+ -+#include -+#include -+#include "test_compile_result.hpp" -+ -+void compile_and_link_test() -+{ -+ check_result(boost::math::bernoulli_b2n(4)); -+} diff --git a/package/boost/boost.hash b/package/boost/boost.hash index 96419506cd..a174e414ee 100644 --- a/package/boost/boost.hash +++ b/package/boost/boost.hash @@ -1,5 +1,5 @@ -# From https://www.boost.org/users/history/version_1_77_0.html -sha256 fc9f85fc030e233142908241af7a846e60630aa7388de9a5fafb1f3a26840854 boost_1_77_0.tar.bz2 +# From https://www.boost.org/users/history/version_1_78_0.html +sha256 8681f175d4bdb26c52222665793eef08490d7758529330f98d3b29dd0735bccc boost_1_78_0.tar.bz2 # Locally computed sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE_1_0.txt diff --git a/package/boost/boost.mk b/package/boost/boost.mk index 3bc8a83875..6e026f4781 100644 --- a/package/boost/boost.mk +++ b/package/boost/boost.mk @@ -4,7 +4,7 @@ # ################################################################################ -BOOST_VERSION = 1.77.0 +BOOST_VERSION = 1.78.0 BOOST_SOURCE = boost_$(subst .,_,$(BOOST_VERSION)).tar.bz2 BOOST_SITE = https://boostorg.jfrog.io/artifactory/main/release/$(BOOST_VERSION)/source BOOST_INSTALL_STAGING = YES