From 20cb0b322d900d28fd371993b1408469799a3ad7 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Sun, 22 Aug 2021 14:50:58 +0200 Subject: boost: upgrade 1.76.0 -> 1.77.0 (From OE-Core rev: ef0531a6ac74bb45ed4bfd4a2d870bedecca02cb) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-support/boost/boost-1.76.0.inc | 20 -------- meta/recipes-support/boost/boost-1.77.0.inc | 20 ++++++++ ...01-Fixes-wrong-type-for-mutex-in-regex-v5.patch | 54 ---------------------- meta/recipes-support/boost/boost_1.76.0.bb | 11 ----- meta/recipes-support/boost/boost_1.77.0.bb | 9 ++++ 5 files changed, 29 insertions(+), 85 deletions(-) delete mode 100644 meta/recipes-support/boost/boost-1.76.0.inc create mode 100644 meta/recipes-support/boost/boost-1.77.0.inc delete mode 100644 meta/recipes-support/boost/boost/0001-Fixes-wrong-type-for-mutex-in-regex-v5.patch delete mode 100644 meta/recipes-support/boost/boost_1.76.0.bb create mode 100644 meta/recipes-support/boost/boost_1.77.0.bb diff --git a/meta/recipes-support/boost/boost-1.76.0.inc b/meta/recipes-support/boost/boost-1.76.0.inc deleted file mode 100644 index c02f38b047..0000000000 --- a/meta/recipes-support/boost/boost-1.76.0.inc +++ /dev/null @@ -1,20 +0,0 @@ -# The Boost web site provides free peer-reviewed portable -# C++ source libraries. The emphasis is on libraries which -# work well with the C++ Standard Library. The libraries are -# intended to be widely useful, and are in regular use by -# thousands of programmers across a broad spectrum of applications. -HOMEPAGE = "http://www.boost.org/" -LICENSE = "BSL-1.0 & MIT & Python-2.0" -LIC_FILES_CHKSUM = "file://LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c" - -BOOST_VER = "${@"_".join(d.getVar("PV").split("."))}" -BOOST_MAJ = "${@"_".join(d.getVar("PV").split(".")[0:2])}" -BOOST_P = "boost_${BOOST_VER}" - -SRC_URI = "https://boostorg.jfrog.io/artifactory/main/release/${PV}/source/${BOOST_P}.tar.bz2" -SRC_URI[sha256sum] = "f0397ba6e982c4450f27bf32a2a83292aba035b827a5623a14636ea583318c41" - -UPSTREAM_CHECK_URI = "http://www.boost.org/users/download/" -UPSTREAM_CHECK_REGEX = "release/(?P.*)/source/" - -S = "${WORKDIR}/${BOOST_P}" diff --git a/meta/recipes-support/boost/boost-1.77.0.inc b/meta/recipes-support/boost/boost-1.77.0.inc new file mode 100644 index 0000000000..6df06e76c7 --- /dev/null +++ b/meta/recipes-support/boost/boost-1.77.0.inc @@ -0,0 +1,20 @@ +# The Boost web site provides free peer-reviewed portable +# C++ source libraries. The emphasis is on libraries which +# work well with the C++ Standard Library. The libraries are +# intended to be widely useful, and are in regular use by +# thousands of programmers across a broad spectrum of applications. +HOMEPAGE = "http://www.boost.org/" +LICENSE = "BSL-1.0 & MIT & Python-2.0" +LIC_FILES_CHKSUM = "file://LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c" + +BOOST_VER = "${@"_".join(d.getVar("PV").split("."))}" +BOOST_MAJ = "${@"_".join(d.getVar("PV").split(".")[0:2])}" +BOOST_P = "boost_${BOOST_VER}" + +SRC_URI = "https://boostorg.jfrog.io/artifactory/main/release/${PV}/source/${BOOST_P}.tar.bz2" +SRC_URI[sha256sum] = "fc9f85fc030e233142908241af7a846e60630aa7388de9a5fafb1f3a26840854" + +UPSTREAM_CHECK_URI = "http://www.boost.org/users/download/" +UPSTREAM_CHECK_REGEX = "release/(?P.*)/source/" + +S = "${WORKDIR}/${BOOST_P}" diff --git a/meta/recipes-support/boost/boost/0001-Fixes-wrong-type-for-mutex-in-regex-v5.patch b/meta/recipes-support/boost/boost/0001-Fixes-wrong-type-for-mutex-in-regex-v5.patch deleted file mode 100644 index a8305ff2e0..0000000000 --- a/meta/recipes-support/boost/boost/0001-Fixes-wrong-type-for-mutex-in-regex-v5.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 6064875bff2e52ba63f01911eb4deb79259c5e3b Mon Sep 17 00:00:00 2001 -From: Carlos Miguel Ferreira -Date: Thu, 3 Jun 2021 23:10:37 +0100 -Subject: [PATCH] Fixes wrong type for mutex in regex v5 - -With the Boost.Regex to ehader-only library, the declaration -of a mutex that should have been changed from boost::static_mutex -to std::mutex was left behind. This was preventing regex from -being built for older arm platforms [1] - -[1]: https://github.com/openwrt/packages/issues/15725 - -Upstream-Status: Submitted [https://github.com/boostorg/regex/pull/132] - -Signed-off-by: Carlos Miguel Ferreira -Signed-off-by: Mingli Yu ---- - boost/regex/v5/mem_block_cache.hpp | 12 ++++-------- - 1 file changed, 4 insertions(+), 8 deletions(-) - -diff --git a/boost/regex/v5/mem_block_cache.hpp b/boost/regex/v5/mem_block_cache.hpp -index 0af4eae1..eb3ec776 100644 ---- a/boost/regex/v5/mem_block_cache.hpp -+++ b/boost/regex/v5/mem_block_cache.hpp -@@ -85,10 +85,10 @@ struct mem_block_node - struct mem_block_cache - { - // this member has to be statically initialsed: -- mem_block_node* next; -- unsigned cached_blocks; -+ mem_block_node* next { nullptr }; -+ unsigned cached_blocks { 0 }; - #ifdef BOOST_HAS_THREADS -- boost::static_mutex mut; -+ std::mutex mut; - #endif - - ~mem_block_cache() -@@ -133,11 +133,7 @@ struct mem_block_cache - } - static mem_block_cache& instance() - { --#ifdef BOOST_HAS_THREADS -- static mem_block_cache block_cache = { 0, 0, BOOST_STATIC_MUTEX_INIT, }; --#else -- static mem_block_cache block_cache = { 0, 0, }; --#endif -+ static mem_block_cache block_cache; - return block_cache; - } - }; --- -2.29.2 - diff --git a/meta/recipes-support/boost/boost_1.76.0.bb b/meta/recipes-support/boost/boost_1.76.0.bb deleted file mode 100644 index ae91b1c875..0000000000 --- a/meta/recipes-support/boost/boost_1.76.0.bb +++ /dev/null @@ -1,11 +0,0 @@ -require boost-${PV}.inc -require boost.inc - -SRC_URI += " \ - file://boost-CVE-2012-2677.patch \ - file://boost-math-disable-pch-for-gcc.patch \ - file://0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch \ - file://0001-dont-setup-compiler-flags-m32-m64.patch \ - file://0001-fiber-libs-Define-SYS_futex-if-it-does-not-exist.patch \ - file://0001-Fixes-wrong-type-for-mutex-in-regex-v5.patch \ - " diff --git a/meta/recipes-support/boost/boost_1.77.0.bb b/meta/recipes-support/boost/boost_1.77.0.bb new file mode 100644 index 0000000000..df8e08ad76 --- /dev/null +++ b/meta/recipes-support/boost/boost_1.77.0.bb @@ -0,0 +1,9 @@ +require boost-${PV}.inc +require boost.inc + +SRC_URI += "file://boost-CVE-2012-2677.patch \ + file://boost-math-disable-pch-for-gcc.patch \ + file://0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch \ + file://0001-dont-setup-compiler-flags-m32-m64.patch \ + file://0001-fiber-libs-Define-SYS_futex-if-it-does-not-exist.patch \ + " -- cgit v1.2.3-54-g00ecf