Message ID | 20230915124933.2975234-1-buildroot@heine.tech |
---|---|
State | Accepted |
Headers | show |
Series | package/boost: bump to version 1.83.0 | expand |
Michael, All, On 2023-09-15 14:49 +0200, Michael Nosthoff via buildroot spake thusly: > - add upstream patch for Unordered available on the Release Page. > Signed-off-by: Michael Nosthoff <buildroot@heine.tech> [--SNIP--] > diff --git a/package/boost/0001-unordered-fix-copy-assign.patch b/package/boost/0001-unordered-fix-copy-assign.patch > new file mode 100644 > index 0000000000..55f5ccf245 > --- /dev/null > +++ b/package/boost/0001-unordered-fix-copy-assign.patch > @@ -0,0 +1,22 @@ > +Upstream Patch for Unordered > + > +Prevent erroneous copying of groups data, update max load to properly propagate > + > +Signed-off-by: Michael Nosthoff <buildroot@heine.tech> > +Upstream: https://github.com/boostorg/unordered/pull/210 We prefer that an Upstream references the actual commit, not the pull-request: https://github.com/boostorg/unordered/commit/067884a4e213352e7c81c441f1453c54735c39f3 If the pull request contains important data that we need to know of, then reference the pull-request in the (buildroot) commit log, maybe with a little summary. In this case, it dopes nt contain anythng interesting, so I just replaced the url with the one to the commit. Applied to master, thanks. Regards, Yann E. MORIN. > +diff --git a/include/boost/unordered/detail/foa/core.hpp b/include/boost/unordered/detail/foa/core.hpp > +index 239d05d3..7ae9f2c8 100644 > +--- a/boost/unordered/detail/foa/core.hpp > ++++ b/boost/unordered/detail/foa/core.hpp > +@@ -1870,9 +1870,10 @@ private: > + > + void fast_copy_elements_from(const table_core& x) > + { > +- if(arrays.elements){ > ++ if(arrays.elements&&x.arrays.elements){ > + copy_elements_array_from(x); > + copy_groups_array_from(x); > ++ size_ctrl.ml=std::size_t(x.size_ctrl.ml); > + size_ctrl.size=std::size_t(x.size_ctrl.size); > + } > + } > diff --git a/package/boost/boost.hash b/package/boost/boost.hash > index 36de2b9b06..14403758ac 100644 > --- a/package/boost/boost.hash > +++ b/package/boost/boost.hash > @@ -1,5 +1,5 @@ > -# From https://www.boost.org/users/history/version_1_82_0.html > -sha256 a6e1ab9b0860e6a2881dd7b21fe9f737a095e5f33a3a874afc6a345228597ee6 boost_1_82_0.tar.bz2 > +# From https://www.boost.org/users/history/version_1_83_0.html > +sha256 6478edfe2f3305127cffe8caf73ea0176c53769f4bf1585be237eb30798c3b8e boost_1_83_0.tar.bz2 > > # Locally computed > sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE_1_0.txt > diff --git a/package/boost/boost.mk b/package/boost/boost.mk > index d432ab48cc..9b1baec5bf 100644 > --- a/package/boost/boost.mk > +++ b/package/boost/boost.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -BOOST_VERSION = 1.82.0 > +BOOST_VERSION = 1.83.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 > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot@buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot
diff --git a/package/boost/0001-unordered-fix-copy-assign.patch b/package/boost/0001-unordered-fix-copy-assign.patch new file mode 100644 index 0000000000..55f5ccf245 --- /dev/null +++ b/package/boost/0001-unordered-fix-copy-assign.patch @@ -0,0 +1,22 @@ +Upstream Patch for Unordered + +Prevent erroneous copying of groups data, update max load to properly propagate + +Signed-off-by: Michael Nosthoff <buildroot@heine.tech> +Upstream: https://github.com/boostorg/unordered/pull/210 +diff --git a/include/boost/unordered/detail/foa/core.hpp b/include/boost/unordered/detail/foa/core.hpp +index 239d05d3..7ae9f2c8 100644 +--- a/boost/unordered/detail/foa/core.hpp ++++ b/boost/unordered/detail/foa/core.hpp +@@ -1870,9 +1870,10 @@ private: + + void fast_copy_elements_from(const table_core& x) + { +- if(arrays.elements){ ++ if(arrays.elements&&x.arrays.elements){ + copy_elements_array_from(x); + copy_groups_array_from(x); ++ size_ctrl.ml=std::size_t(x.size_ctrl.ml); + size_ctrl.size=std::size_t(x.size_ctrl.size); + } + } diff --git a/package/boost/boost.hash b/package/boost/boost.hash index 36de2b9b06..14403758ac 100644 --- a/package/boost/boost.hash +++ b/package/boost/boost.hash @@ -1,5 +1,5 @@ -# From https://www.boost.org/users/history/version_1_82_0.html -sha256 a6e1ab9b0860e6a2881dd7b21fe9f737a095e5f33a3a874afc6a345228597ee6 boost_1_82_0.tar.bz2 +# From https://www.boost.org/users/history/version_1_83_0.html +sha256 6478edfe2f3305127cffe8caf73ea0176c53769f4bf1585be237eb30798c3b8e boost_1_83_0.tar.bz2 # Locally computed sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE_1_0.txt diff --git a/package/boost/boost.mk b/package/boost/boost.mk index d432ab48cc..9b1baec5bf 100644 --- a/package/boost/boost.mk +++ b/package/boost/boost.mk @@ -4,7 +4,7 @@ # ################################################################################ -BOOST_VERSION = 1.82.0 +BOOST_VERSION = 1.83.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
- add upstream patch for Unordered available on the Release Page. Signed-off-by: Michael Nosthoff <buildroot@heine.tech> --- Compile-tested with the following defconfigs: BR2_arm=y BR2_cortex_a15=y BR2_ARM_FPU_NEON=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y BR2_PACKAGE_CC_TOOL=y BR2_PACKAGE_LIBUBOOTENV=y BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_BOTAN=y BR2_PACKAGE_LOG4CXX=y BR2_PACKAGE_LIBCPPRESTSDK=y BR2_PACKAGE_BOOST_CONTRACT=y BR2_PACKAGE_BOOST_COROUTINE=y BR2_PACKAGE_BOOST_EXCEPTION=y BR2_PACKAGE_BOOST_FIBER=y BR2_PACKAGE_BOOST_GRAPH=y BR2_PACKAGE_BOOST_GRAPH_PARALLEL=y BR2_PACKAGE_BOOST_IOSTREAMS=y BR2_PACKAGE_BOOST_JSON=y BR2_PACKAGE_BOOST_LOCALE=y BR2_PACKAGE_BOOST_LOG=y BR2_PACKAGE_BOOST_MATH=y BR2_PACKAGE_BOOST_MPI=y BR2_PACKAGE_BOOST_NOWIDE=y BR2_PACKAGE_BOOST_PYTHON=y BR2_PACKAGE_BOOST_SERIALIZATION=y BR2_PACKAGE_BOOST_STACKTRACE=y BR2_PACKAGE_BOOST_TEST=y BR2_PACKAGE_BOOST_TYPE_ERASURE=y BR2_PACKAGE_BOOST_URL=y BR2_PACKAGE_BOOST_WAVE=y BR2_PACKAGE_BITCOIN=y BR2_PACKAGE_I2PD=y BR2_aarch64=y BR2_TOOLCHAIN_EXTERNAL=y BR2_PACKAGE_QT5=y BR2_PACKAGE_PULSEVIEW=y BR2_PACKAGE_GNURADIO=y BR2_sh=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_UCLIBC_STABLE=y BR2_PACKAGE_BOOST=y BR2_PACKAGE_BOOST_CONTRACT=y BR2_PACKAGE_BOOST_EXCEPTION=y BR2_PACKAGE_BOOST_GRAPH=y BR2_PACKAGE_BOOST_GRAPH_PARALLEL=y BR2_PACKAGE_BOOST_IOSTREAMS=y BR2_PACKAGE_BOOST_JSON=y BR2_PACKAGE_BOOST_LOCALE=y BR2_PACKAGE_BOOST_LOG=y BR2_PACKAGE_BOOST_MATH=y BR2_PACKAGE_BOOST_MPI=y BR2_PACKAGE_BOOST_NOWIDE=y BR2_PACKAGE_BOOST_PROGRAM_OPTIONS=y BR2_PACKAGE_BOOST_RANDOM=y BR2_PACKAGE_BOOST_SERIALIZATION=y BR2_PACKAGE_BOOST_STACKTRACE=y BR2_PACKAGE_BOOST_TEST=y BR2_PACKAGE_BOOST_TYPE_ERASURE=y BR2_PACKAGE_BOOST_URL=y BR2_PACKAGE_BOOST_WAVE=y BR2_x86_64=y BR2_TOOLCHAIN_EXTERNAL=y BR2_PACKAGE_BOOST=y BR2_PACKAGE_BOOST_CONTRACT=y BR2_PACKAGE_BOOST_COROUTINE=y BR2_PACKAGE_BOOST_EXCEPTION=y BR2_PACKAGE_BOOST_FIBER=y BR2_PACKAGE_BOOST_GRAPH=y BR2_PACKAGE_BOOST_GRAPH_PARALLEL=y BR2_PACKAGE_BOOST_IOSTREAMS=y BR2_PACKAGE_BOOST_JSON=y BR2_PACKAGE_BOOST_LOCALE=y BR2_PACKAGE_BOOST_LOG=y BR2_PACKAGE_BOOST_MATH=y BR2_PACKAGE_BOOST_MPI=y BR2_PACKAGE_BOOST_NOWIDE=y BR2_PACKAGE_BOOST_PROGRAM_OPTIONS=y BR2_PACKAGE_BOOST_RANDOM=y BR2_PACKAGE_BOOST_SERIALIZATION=y BR2_PACKAGE_BOOST_STACKTRACE=y BR2_PACKAGE_BOOST_TEST=y BR2_PACKAGE_BOOST_TYPE_ERASURE=y BR2_PACKAGE_BOOST_URL=y BR2_PACKAGE_BOOST_WAVE=y --- .../0001-unordered-fix-copy-assign.patch | 22 +++++++++++++++++++ package/boost/boost.hash | 4 ++-- package/boost/boost.mk | 2 +- 3 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 package/boost/0001-unordered-fix-copy-assign.patch