package/boost: bump version to 1.79.0
PATCH 1/1 package/boost: bump version to 1.79.0
- remove upstreamed patch
- add patch for boost::json bug in known issues on the boost release page [0]
[0] https://www.boost.org/users/history/version_1_79_0.html
--- ...stat-h-include-on-musl-based-systems.patch | 31 --------- .../0001-json-array-erase-relocate.patch | 65 +++++++++++++++++++ package/boost/boost.hash | 4 +- package/boost/boost.mk | 2 +- 4 files changed, 68 insertions(+), 34 deletions(-) delete mode 100644 package/boost/0001-Fix-missing-sys-stat-h-include-on-musl-based-systems.patch create mode 100644 package/boost/0001-json-array-erase-relocate.patch
package/boost/0001-Fix-missing-sys-stat-h-include-on-musl-based-systems.patch deleted +0 -31
@@ -1,31 +0,0 @@ -From de657e01635306085488290ea83de541ec393f8b Mon Sep 17 00:00:00 2001 -From: Leonardo Neumann <[email protected]> -Date: Mon, 13 Dec 2021 01:07:20 -0300 -Subject: [PATCH] Fix missing sys/stat.h include on musl-based systems - -Boost 1.78.0 fails to build on musl-based systems because musl does -not include sys/stat.h by default. - -Fixes #161 ("Boost compiler error") - -Signed-off-by: Fabrice Fontaine <[email protected]> -[Upstream status: https://github.com/boostorg/interprocess/pull/162] ---- - include/boost/interprocess/permissions.hpp | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/boost/interprocess/permissions.hpp b/boost/interprocess/permissions.hpp -index ab55411e..0b21a685 100644 ---- a/boost/interprocess/permissions.hpp -+++ b/boost/interprocess/permissions.hpp -@@ -29,6 +29,10 @@ - - #include <boost/interprocess/detail/win32_api.hpp> - -+#else -+ -+#include <sys/stat.h> -+ - #endif - - #endif //#ifndef BOOST_INTERPROCESS_DOXYGEN_INVOKED
package/boost/0001-json-array-erase-relocate.patch new file +65 -0
65 lines not on this page · raw message
package/boost/boost.hash +2 -2
@@ -1,5 +1,5 @@ -# From https://www.boost.org/users/history/version_1_78_0.html -sha256 8681f175d4bdb26c52222665793eef08490d7758529330f98d3b29dd0735bccc boost_1_78_0.tar.bz2 +# From https://www.boost.org/users/history/version_1_79_0.html +sha256 475d589d51a7f8b3ba2ba4eda022b170e562ca3b760ee922c146b6c65856ef39 boost_1_79_0.tar.bz2 # Locally computed sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE_1_0.txt
package/boost/boost.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -BOOST_VERSION = 1.78.0 +BOOST_VERSION = 1.79.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
Signature · 6 lines
2.25.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Arnout Vandecappelle
AppliedQuoted 6 lines · Michael Nosthoff via buildroot
- remove upstreamed patch
- add patch forboost::jsonbug in known issues on the boost release page [0][0] https://www.boost.org/users/history/version_1_79_0.html
Signed-off-by Michael Nosthoff <[email protected]>
Applied to master, thanks.
Regards,
Arnout
Quoted 134 lines
--- ...stat-h-include-on-musl-based-systems.patch | 31 --------- .../0001-json-array-erase-relocate.patch | 65 +++++++++++++++++++ package/boost/boost.hash | 4 +- package/boost/boost.mk | 2 +- 4 files changed, 68 insertions(+), 34 deletions(-)delete mode 100644
package/boost/0001-Fix-missing-sys-stat-h-include-on-musl-based-systems.patchcreate mode 100644package/boost/0001-json-array-erase-relocate.patchpackage/boost/0001-Fix-missing-sys-stat-h-include-on-musl-based-systems.patch deleted +0
-31@@ -1,31 +0,0 @@ -From de657e01635306085488290ea83de541ec393f8b Mon Sep 17 00:00:00 2001 -From: Leonardo Neumann <[email protected]> -Date: Mon, 13 Dec 2021 01:07:20 -0300 -Subject: [PATCH] Fix missing sys/stat.h include on musl-based systems - -Boost 1.78.0 fails to build on musl-based systems because musl does -not include sys/stat.h by default. - -Fixes #161 ("Boost compiler error") - -Signed-off-by: Fabrice Fontaine <[email protected]> -[Upstream status: https://github.com/boostorg/interprocess/pull/162] ---- - include/boost/interprocess/permissions.hpp | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/boost/interprocess/permissions.hpp b/boost/interprocess/permissions.hpp -index ab55411e..0b21a685 100644 ---- a/boost/interprocess/permissions.hpp -+++ b/boost/interprocess/permissions.hpp -@@ -29,6 +29,10 @@ - - #include <boost/interprocess/detail/win32_api.hpp> - -+#else -+ -+#include <sys/stat.h> -+ - #endif - - #endif //#ifndef BOOST_INTERPROCESS_DOXYGEN_INVOKEDpackage/boost/0001-json-array-erase-relocate.patch new file +65
-0@@ -0,0 +1,65 @@ +From 07d7c3b2e0f8c6b269ba167117cd3e549df2f342 Mon Sep 17 00:00:00 2001 +From: Vinnie Falco <[email protected]> +Date: Wed, 13 Apr 2022 05:49:05 -0700 +Subject: [PATCH] array::erase relocates correctly + +fix #692 + +Signed-off-by: Michael Nosthoff<[email protected]> +[Upstream status: https://github.com/boostorg/json/issues/692] +--- + boost/json/impl/array.ipp | 5 ++++- + test/array.cpp | 16 ++++++++++++++++ + 2 files changed, 20 insertions(+), 1 deletion(-) + +diff --git a/boost/json/impl/array.ipp b/boost/json/impl/array.ipp +index 4d067fb5..a2c7fd6d 100644 +--- a/boost/json/impl/array.ipp ++++ b/boost/json/impl/array.ipp +@@ -491,8 +491,11 @@ erase( + 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 --git a/libs/json/test/array.cpp b/libs/json/test/array.cpp +index 1cc87566..4516cc78 100644 +--- a/libs/json/test/array.cpp ++++ b/libs/json/test/array.cpp +@@ -1269,6 +1269,21 @@ class array_test + array{nullptr, "a", "b"})); + } + ++ 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() + { +@@ -1283,6 +1298,7 @@ class array_test + testExceptions(); + testEquality(); + testHash(); ++ testIssue692(); + } + }; +package/boost/boost.hash +2
-2@@ -1,5 +1,5 @@ -# From https://www.boost.org/users/history/version_1_78_0.html -sha256 8681f175d4bdb26c52222665793eef08490d7758529330f98d3b29dd0735bccc boost_1_78_0.tar.bz2 +# From https://www.boost.org/users/history/version_1_79_0.html +sha256 475d589d51a7f8b3ba2ba4eda022b170e562ca3b760ee922c146b6c65856ef39 boost_1_79_0.tar.bz2 # Locally computed sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE_1_0.txtpackage/boost/boost.mk +0
-0
package/boost/boost.mk line 10
Quoted 8 lines
package/boost/boost.mk +1
-1@@ -4,7 +4,7 @@ # ################################################################################ -BOOST_VERSION = 1.78.0 +BOOST_VERSION = 1.79.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
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot