diff --git a/recipes/recipes_emscripten/boost-cpp/0001-config-libcpp15.patch b/recipes/recipes_emscripten/boost-cpp/0001-config-libcpp15.patch deleted file mode 100644 index 7e4abc75c..000000000 --- a/recipes/recipes_emscripten/boost-cpp/0001-config-libcpp15.patch +++ /dev/null @@ -1,30 +0,0 @@ -From de5ce13c939ef8fd581470eb712fd659475a9155 Mon Sep 17 00:00:00 2001 -From: ryanking13 -Date: Fri, 11 Nov 2022 11:50:42 +0900 -Subject: [PATCH 1/1] 0005-config-libcpp15 - ---- - include/boost/config/stdlib/libcpp.hpp | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/boost/config/stdlib/libcpp.hpp b/boost/config/stdlib/libcpp.hpp -index bc8536ea..0e9f2445 100644 ---- a/boost/config/stdlib/libcpp.hpp -+++ b/boost/config/stdlib/libcpp.hpp -@@ -168,4 +168,13 @@ - # define BOOST_NO_CXX14_HDR_SHARED_MUTEX - #endif - -+#if _LIBCPP_VERSION >= 15000 -+// -+// Unary function is now deprecated in C++11 and later: -+// -+#if __cplusplus >= 201103L -+#define BOOST_NO_CXX98_FUNCTION_BASE -+#endif -+#endif -+ - // --- end --- --- -2.29.2.windows.2 - diff --git a/recipes/recipes_emscripten/boost-cpp/0001-json-array-erase-relocate.patch b/recipes/recipes_emscripten/boost-cpp/0001-json-array-erase-relocate.patch deleted file mode 100644 index 69d4e3595..000000000 --- a/recipes/recipes_emscripten/boost-cpp/0001-json-array-erase-relocate.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff -ur boost_1_79_0/boost/json/impl/array.ipp boost_1_79_0/boost/json/impl/array.ipp ---- boost_1_79_0/boost/json/impl/array.ipp 2022-04-06 17:02:43.000000000 -0400 -+++ boost_1_79_0/boost/json/impl/array.ipp 2022-04-13 20:55:20.464359478 -0400 -@@ -491,8 +491,11 @@ - auto const p = &(*t_)[0] + - (pos - &(*t_)[0]); - destroy(p, p + 1); -- relocate(p, p + 1, 1); - --t_->size; -+ if(t_->size > 0) -+ relocate(p, p + 1, -+ t_->size - (p - -+ &(*t_)[0])); - return p; - } - -diff -ur boost_1_79_0/libs/json/test/array.cpp boost_1_79_0/libs/json/test/array.cpp ---- boost_1_79_0/libs/json/test/array.cpp 2022-04-06 17:02:43.000000000 -0400 -+++ boost_1_79_0/libs/json/test/array.cpp 2022-04-13 20:53:32.671782680 -0400 -@@ -1270,6 +1270,21 @@ - } - - void -+ testIssue692() -+ { -+ array a; -+ object obj; -+ obj["test1"] = "hello"; -+ a.push_back(obj); -+ a.push_back(obj); -+ a.push_back(obj); -+ a.push_back(obj); -+ a.push_back(obj); -+ while(a.size()) -+ a.erase(a.begin()); -+ } -+ -+ void - run() - { - testDestroy(); -@@ -1283,6 +1298,7 @@ - testExceptions(); - testEquality(); - testHash(); -+ testIssue692(); - } - }; - diff --git a/recipes/recipes_emscripten/boost-cpp/0002-outcome-account-for-void-types.patch b/recipes/recipes_emscripten/boost-cpp/0002-outcome-account-for-void-types.patch deleted file mode 100644 index 06b9f6c04..000000000 --- a/recipes/recipes_emscripten/boost-cpp/0002-outcome-account-for-void-types.patch +++ /dev/null @@ -1,187 +0,0 @@ -diff --git boost_1_79_0/boost/outcome/detail/revision.hpp boost_1_79_0/boost/outcome/detail/revision.hpp -index 1664273d..c6738b9e 100644 ---- boost_1_79_0/boost/outcome/detail/revision.hpp -+++ boost_1_79_0/boost/outcome/detail/revision.hpp -@@ -22,6 +22,6 @@ Distributed under the Boost Software License, Version 1.0. - */ - - // Note the second line of this file must ALWAYS be the git SHA, third line ALWAYS the git SHA update time --#define BOOST_OUTCOME_PREVIOUS_COMMIT_REF 147ec1e8673c34cb7cf431dfdbf211d8072d7656 --#define BOOST_OUTCOME_PREVIOUS_COMMIT_DATE "2022-03-17 19:38:05 +00:00" --#define BOOST_OUTCOME_PREVIOUS_COMMIT_UNIQUE 147ec1e8 -+#define BOOST_OUTCOME_PREVIOUS_COMMIT_REF 5e36246352c1c412813583e446eea0d1a19d08cc -+#define BOOST_OUTCOME_PREVIOUS_COMMIT_DATE "2022-04-05 06:23:15 +00:00" -+#define BOOST_OUTCOME_PREVIOUS_COMMIT_UNIQUE 5e362463 -diff --git boost_1_79_0/boost/outcome/detail/value_storage.hpp boost_1_79_0/boost/outcome/detail/value_storage.hpp -index 9f9b11c1..4e12c6e4 100644 ---- boost_1_79_0/boost/outcome/detail/value_storage.hpp -+++ boost_1_79_0/boost/outcome/detail/value_storage.hpp -@@ -41,19 +41,32 @@ namespace detail - // Prefer to use move or copy construction - template struct move_assign_to_empty - { -- move_assign_to_empty(T *dest, T &&o) noexcept(std::is_nothrow_move_constructible::value) { new(dest) T(static_cast(o)); } -+ move_assign_to_empty(T *dest, T *o) noexcept(std::is_nothrow_move_constructible::value) { new(dest) T(static_cast(*o)); } - }; - template struct move_assign_to_empty - { -- move_assign_to_empty(T *dest, T &&o) noexcept(std::is_nothrow_move_constructible::value) { new(dest) T(static_cast(o)); } -+ move_assign_to_empty(T *dest, T *o) noexcept(std::is_nothrow_move_constructible::value) { new(dest) T(static_cast(*o)); } - }; - // But fall back on default construction and move assign if necessary - template struct move_assign_to_empty - { -- move_assign_to_empty(T *dest, T &&o) noexcept(std::is_nothrow_default_constructible::value &&std::is_nothrow_move_assignable::value) -+ move_assign_to_empty(T *dest, T *o) noexcept(std::is_nothrow_default_constructible::value &&std::is_nothrow_move_assignable::value) - { - new(dest) T; -- *dest = static_cast(o); -+ *dest = static_cast(*o); -+ } -+ }; -+ // Void does nothing -+ template <> struct move_assign_to_empty -+ { -+ move_assign_to_empty(void *, void *) noexcept -+ { /* nothing to assign */ -+ } -+ }; -+ template <> struct move_assign_to_empty -+ { -+ move_assign_to_empty(const void *, const void *) noexcept -+ { /* nothing to assign */ - } - }; - // Helpers for copy assigning to empty storage -@@ -63,19 +76,32 @@ namespace detail - // Prefer to use copy construction - template struct copy_assign_to_empty - { -- copy_assign_to_empty(T *dest, const T &o) noexcept(std::is_nothrow_copy_constructible::value) { new(dest) T(o); } -+ copy_assign_to_empty(T *dest, const T *o) noexcept(std::is_nothrow_copy_constructible::value) { new(dest) T(*o); } - }; - template struct copy_assign_to_empty - { -- copy_assign_to_empty(T *dest, const T &o) noexcept(std::is_nothrow_copy_constructible::value) { new(dest) T(o); } -+ copy_assign_to_empty(T *dest, const T *o) noexcept(std::is_nothrow_copy_constructible::value) { new(dest) T(*o); } - }; - // But fall back on default construction and copy assign if necessary - template struct copy_assign_to_empty - { -- copy_assign_to_empty(T *dest, const T &o) noexcept(std::is_nothrow_default_constructible::value &&std::is_nothrow_copy_assignable::value) -+ copy_assign_to_empty(T *dest, const T *o) noexcept(std::is_nothrow_default_constructible::value &&std::is_nothrow_copy_assignable::value) - { - new(dest) T; -- *dest = o; -+ *dest = *o; -+ } -+ }; -+ // Void does nothing -+ template <> struct copy_assign_to_empty -+ { -+ copy_assign_to_empty(void *, void *) noexcept -+ { /* nothing to assign */ -+ } -+ }; -+ template <> struct copy_assign_to_empty -+ { -+ copy_assign_to_empty(const void *, const void *) noexcept -+ { /* nothing to assign */ - } - }; - -@@ -1443,8 +1469,9 @@ namespace detail - value_storage_nontrivial_move_assignment & - operator=(value_storage_nontrivial_move_assignment &&o) noexcept( - std::is_nothrow_move_assignable::value &&std::is_nothrow_move_assignable::value &&noexcept(move_assign_to_empty( -- static_cast(nullptr), std::declval())) &&noexcept(move_assign_to_empty(static_cast(nullptr), -- std::declval()))) // NOLINT -+ static_cast(nullptr), -+ static_cast(nullptr))) &&noexcept(move_assign_to_empty(static_cast(nullptr), -+ static_cast(nullptr)))) // NOLINT - { - using _value_type_ = typename Base::_value_type_; - using _error_type_ = typename Base::_error_type_; -@@ -1480,7 +1507,7 @@ namespace detail - } - if(!this->_status.have_value() && !this->_status.have_error() && o._status.have_value()) - { -- move_assign_to_empty<_value_type_>(&this->_value, static_cast<_value_type_ &&>(o._value)); -+ move_assign_to_empty<_value_type_>(&this->_value, &o._value); - this->_status = o._status; - o._status.set_have_moved_from(true); - return *this; -@@ -1497,7 +1524,7 @@ namespace detail - } - if(!this->_status.have_value() && !this->_status.have_error() && o._status.have_error()) - { -- move_assign_to_empty<_error_type_>(&this->_error, static_cast<_error_type_ &&>(o._error)); -+ move_assign_to_empty<_error_type_>(&this->_error, &o._error); - this->_status = o._status; - o._status.set_have_moved_from(true); - return *this; -@@ -1508,7 +1535,7 @@ namespace detail - { - this->_value.~_value_type_(); // NOLINT - } -- move_assign_to_empty<_error_type_>(&this->_error, static_cast<_error_type_ &&>(o._error)); -+ move_assign_to_empty<_error_type_>(&this->_error, &o._error); - this->_status = o._status; - o._status.set_have_moved_from(true); - return *this; -@@ -1519,7 +1546,7 @@ namespace detail - { - this->_error.~_error_type_(); // NOLINT - } -- move_assign_to_empty<_value_type_>(&this->_value, static_cast<_value_type_ &&>(o._value)); -+ move_assign_to_empty<_value_type_>(&this->_value, &o._value); - this->_status = o._status; - o._status.set_have_moved_from(true); - return *this; -@@ -1544,8 +1571,8 @@ namespace detail - value_storage_nontrivial_copy_assignment & - operator=(const value_storage_nontrivial_copy_assignment &o) noexcept( - std::is_nothrow_copy_assignable::value &&std::is_nothrow_copy_assignable::value &&noexcept(copy_assign_to_empty( -- static_cast(nullptr), std::declval())) &&noexcept(copy_assign_to_empty(static_cast(nullptr), -- std::declval()))) -+ static_cast(nullptr), static_cast(nullptr))) &&noexcept(copy_assign_to_empty(static_cast(nullptr), -+ static_cast(nullptr)))) - { - using _value_type_ = typename Base::_value_type_; - using _error_type_ = typename Base::_error_type_; -@@ -1577,7 +1604,7 @@ namespace detail - } - if(!this->_status.have_value() && !this->_status.have_error() && o._status.have_value()) - { -- copy_assign_to_empty<_value_type_>(&this->_value, o._value); -+ copy_assign_to_empty<_value_type_>(&this->_value, &o._value); - this->_status = o._status; - return *this; - } -@@ -1592,7 +1619,7 @@ namespace detail - } - if(!this->_status.have_value() && !this->_status.have_error() && o._status.have_error()) - { -- copy_assign_to_empty<_error_type_>(&this->_error, o._error); -+ copy_assign_to_empty<_error_type_>(&this->_error, &o._error); - this->_status = o._status; - return *this; - } -@@ -1602,7 +1629,7 @@ namespace detail - { - this->_value.~_value_type_(); // NOLINT - } -- copy_assign_to_empty<_error_type_>(&this->_error, o._error); -+ copy_assign_to_empty<_error_type_>(&this->_error, &o._error); - this->_status = o._status; - return *this; - } -@@ -1612,7 +1639,7 @@ namespace detail - { - this->_error.~_error_type_(); // NOLINT - } -- copy_assign_to_empty<_value_type_>(&this->_value, o._value); -+ copy_assign_to_empty<_value_type_>(&this->_value, &o._value); - this->_status = o._status; - return *this; - } diff --git a/recipes/recipes_emscripten/boost-cpp/5eff1ecc8413b0dc93a1ab047d7fed751e6cb40e.patch b/recipes/recipes_emscripten/boost-cpp/5eff1ecc8413b0dc93a1ab047d7fed751e6cb40e.patch deleted file mode 100644 index d3477a431..000000000 --- a/recipes/recipes_emscripten/boost-cpp/5eff1ecc8413b0dc93a1ab047d7fed751e6cb40e.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 5eff1ecc8413b0dc93a1ab047d7fed751e6cb40e Mon Sep 17 00:00:00 2001 -From: Samuel Debionne -Date: Fri, 30 Apr 2021 11:55:58 +0200 -Subject: [PATCH] Add default value for cxx and cxxflags options for the cxx - ---- - bootstrap.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/bootstrap.sh b/bootstrap.sh -index 654801e21..1c75a39f4 100755 ---- a/bootstrap.sh -+++ b/bootstrap.sh -@@ -226,7 +226,7 @@ rm -f config.log - if test "x$BJAM" = x; then - $ECHO "Building B2 engine.." - pwd=`pwd` -- CXX= CXXFLAGS= "$my_dir/tools/build/src/engine/build.sh" ${TOOLSET} -+ "$my_dir/tools/build/src/engine/build.sh" ${TOOLSET} --cxx="$CXX" --cxxflags="$CXXFLAGS" - if [ $? -ne 0 ]; then - echo - echo "Failed to build B2 build engine" --- -2.20.1 diff --git a/recipes/recipes_emscripten/boost-cpp/recipe.yaml b/recipes/recipes_emscripten/boost-cpp/recipe.yaml index 5915b07e6..fc9d43bbc 100644 --- a/recipes/recipes_emscripten/boost-cpp/recipe.yaml +++ b/recipes/recipes_emscripten/boost-cpp/recipe.yaml @@ -1,15 +1,13 @@ context: - version: "1.84.0" + version: 1.84.0 package: name: boost-cpp version: ${{ version }} source: - url: https://github.com/boostorg/boost/releases/download/boost-1.84.0/boost-1.84.0.tar.gz + url: https://github.com/boostorg/boost/releases/download/boost-${{ version }}/boost-${{ version }}.tar.gz sha256: 4d27e9efed0f6f152dc28db6430b9d3dfb40c0345da7342eaa5a987dde57bd95 - # patches: - # - 0001-config-libcpp15.patch build: number: 0