From 21233a320ba15e7b2bad64233a8356d23ea165cb Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Wed, 21 Dec 2022 10:59:07 +0800 Subject: boost: upgrade 1.80.0 -> 1.81.0 0001-The-std-lib-unary-binary_function-base-classes-are-d.patch removed since it's included in 1.81.0 (From OE-Core rev: 16d33730845895dac7e6fa1e03778ca49b37adce) Signed-off-by: Wang Mingyu Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- meta/recipes-support/boost/boost-1.80.0.inc | 20 ------------- meta/recipes-support/boost/boost-1.81.0.inc | 20 +++++++++++++ ...-unary-binary_function-base-classes-are-d.patch | 34 ---------------------- meta/recipes-support/boost/boost_1.80.0.bb | 8 ----- meta/recipes-support/boost/boost_1.81.0.bb | 7 +++++ 5 files changed, 27 insertions(+), 62 deletions(-) delete mode 100644 meta/recipes-support/boost/boost-1.80.0.inc create mode 100644 meta/recipes-support/boost/boost-1.81.0.inc delete mode 100644 meta/recipes-support/boost/boost/0001-The-std-lib-unary-binary_function-base-classes-are-d.patch delete mode 100644 meta/recipes-support/boost/boost_1.80.0.bb create mode 100644 meta/recipes-support/boost/boost_1.81.0.bb (limited to 'meta') diff --git a/meta/recipes-support/boost/boost-1.80.0.inc b/meta/recipes-support/boost/boost-1.80.0.inc deleted file mode 100644 index 3ee82eb9b2..0000000000 --- a/meta/recipes-support/boost/boost-1.80.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] = "1e19565d82e43bc59209a168f5ac899d3ba471d55c7610c677d4ccf2c9c500c0" - -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.81.0.inc b/meta/recipes-support/boost/boost-1.81.0.inc new file mode 100644 index 0000000000..291796c736 --- /dev/null +++ b/meta/recipes-support/boost/boost-1.81.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] = "71feeed900fbccca04a3b4f2f84a7c217186f28a940ed8b7ed4725986baf99fa" + +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-The-std-lib-unary-binary_function-base-classes-are-d.patch b/meta/recipes-support/boost/boost/0001-The-std-lib-unary-binary_function-base-classes-are-d.patch deleted file mode 100644 index 49603348ee..0000000000 --- a/meta/recipes-support/boost/boost/0001-The-std-lib-unary-binary_function-base-classes-are-d.patch +++ /dev/null @@ -1,34 +0,0 @@ -From f9b55f5a1fab85bf73c95e6372779d6f50f75e84 Mon Sep 17 00:00:00 2001 -From: jzmaddock -Date: Mon, 11 Jul 2022 18:26:07 +0100 -Subject: [PATCH] The std lib unary/binary_function base classes are - deprecated/removed from libcpp15. Fixes - https://github.com/boostorg/container_hash/issues/24. - -Upstream-Status: Backport [https://github.com/boostorg/config/pull/440/commits/f0af4a9184457939b89110795ae2d293582c5f66] -Signed-off-by: Khem Raj ---- - 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 bc8536ead..0e9f2445e 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.37.2 - diff --git a/meta/recipes-support/boost/boost_1.80.0.bb b/meta/recipes-support/boost/boost_1.80.0.bb deleted file mode 100644 index c34ab7d703..0000000000 --- a/meta/recipes-support/boost/boost_1.80.0.bb +++ /dev/null @@ -1,8 +0,0 @@ -require boost-${PV}.inc -require boost.inc - -SRC_URI += "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-The-std-lib-unary-binary_function-base-classes-are-d.patch \ - " diff --git a/meta/recipes-support/boost/boost_1.81.0.bb b/meta/recipes-support/boost/boost_1.81.0.bb new file mode 100644 index 0000000000..4b580d078b --- /dev/null +++ b/meta/recipes-support/boost/boost_1.81.0.bb @@ -0,0 +1,7 @@ +require boost-${PV}.inc +require boost.inc + +SRC_URI += "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 \ + " -- cgit v1.2.3-54-g00ecf