From c65340f13eebf8a42782b3443f0c79cc96552e9e Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 8 Jan 2025 09:42:17 +0100 Subject: boost: update 1.86.0 -> 1.87.0 Backport a kea patch to address 1.87.0 compatibility. (From OE-Core rev: ac328183d4592ad146c41e48c2c92d1dbb53a894) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-support/boost/boost-1.86.0.inc | 20 ---------------- meta/recipes-support/boost/boost-1.87.0.inc | 20 ++++++++++++++++ .../boost/boost-build-native_1.86.0.bb | 28 ---------------------- .../boost/boost-build-native_1.87.0.bb | 28 ++++++++++++++++++++++ ...p-arch-instruction-set-flags-we-do-that-o.patch | 2 +- .../0001-dont-setup-compiler-flags-m32-m64.patch | 2 +- .../boost/boost-math-disable-pch-for-gcc.patch | 8 +++---- meta/recipes-support/boost/boost_1.86.0.bb | 7 ------ meta/recipes-support/boost/boost_1.87.0.bb | 7 ++++++ 9 files changed, 61 insertions(+), 61 deletions(-) delete mode 100644 meta/recipes-support/boost/boost-1.86.0.inc create mode 100644 meta/recipes-support/boost/boost-1.87.0.inc delete mode 100644 meta/recipes-support/boost/boost-build-native_1.86.0.bb create mode 100644 meta/recipes-support/boost/boost-build-native_1.87.0.bb delete mode 100644 meta/recipes-support/boost/boost_1.86.0.bb create mode 100644 meta/recipes-support/boost/boost_1.87.0.bb (limited to 'meta/recipes-support') diff --git a/meta/recipes-support/boost/boost-1.86.0.inc b/meta/recipes-support/boost/boost-1.86.0.inc deleted file mode 100644 index 7113a50049..0000000000 --- a/meta/recipes-support/boost/boost-1.86.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://archives.boost.io/release/${PV}/source/${BOOST_P}.tar.bz2" -SRC_URI[sha256sum] = "1bed88e40401b2cb7a1f76d4bab499e352fa4d0c5f31c0dbae64e24d34d7513b" - -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.87.0.inc b/meta/recipes-support/boost/boost-1.87.0.inc new file mode 100644 index 0000000000..c6e55b239e --- /dev/null +++ b/meta/recipes-support/boost/boost-1.87.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://archives.boost.io/release/${PV}/source/${BOOST_P}.tar.bz2" +SRC_URI[sha256sum] = "af57be25cb4c4f4b413ed692fe378affb4352ea50fbe294a11ef548f4d527d89" + +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-build-native_1.86.0.bb b/meta/recipes-support/boost/boost-build-native_1.86.0.bb deleted file mode 100644 index 764f410780..0000000000 --- a/meta/recipes-support/boost/boost-build-native_1.86.0.bb +++ /dev/null @@ -1,28 +0,0 @@ -SUMMARY = "Boost.Build" -DESCRIPTION = "B2 makes it easy to build C++ projects, everywhere." -HOMEPAGE = "https://github.com/boostorg/build" -SECTION = "devel" - -LICENSE = "BSL-1.0" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c" - -SRC_URI = "git://github.com/boostorg/build;protocol=https;branch=master" -SRCREV = "4a52d8c06635435b64e31a56eaf7ca5dc912a71d" -PE = "1" - -UPSTREAM_CHECK_GITTAGREGEX = "boost-(?P(\d+(\.\d+)+))" - -inherit native - -S = "${WORKDIR}/git" - -do_compile() { - ./bootstrap.sh -} - -do_install() { - HOME=/var/run ./b2 install --prefix=${D}${prefix} -} - -# The build is either release mode (pre-stripped) or debug (-O0). -INSANE_SKIP:${PN} = "already-stripped" diff --git a/meta/recipes-support/boost/boost-build-native_1.87.0.bb b/meta/recipes-support/boost/boost-build-native_1.87.0.bb new file mode 100644 index 0000000000..764f410780 --- /dev/null +++ b/meta/recipes-support/boost/boost-build-native_1.87.0.bb @@ -0,0 +1,28 @@ +SUMMARY = "Boost.Build" +DESCRIPTION = "B2 makes it easy to build C++ projects, everywhere." +HOMEPAGE = "https://github.com/boostorg/build" +SECTION = "devel" + +LICENSE = "BSL-1.0" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c" + +SRC_URI = "git://github.com/boostorg/build;protocol=https;branch=master" +SRCREV = "4a52d8c06635435b64e31a56eaf7ca5dc912a71d" +PE = "1" + +UPSTREAM_CHECK_GITTAGREGEX = "boost-(?P(\d+(\.\d+)+))" + +inherit native + +S = "${WORKDIR}/git" + +do_compile() { + ./bootstrap.sh +} + +do_install() { + HOME=/var/run ./b2 install --prefix=${D}${prefix} +} + +# The build is either release mode (pre-stripped) or debug (-O0). +INSANE_SKIP:${PN} = "already-stripped" diff --git a/meta/recipes-support/boost/boost/0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch b/meta/recipes-support/boost/boost/0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch index 78f652f619..04bede4578 100644 --- a/meta/recipes-support/boost/boost/0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch +++ b/meta/recipes-support/boost/boost/0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch @@ -1,4 +1,4 @@ -From f88354966fe3af33fd6d9ec889a8e3926b886a8a Mon Sep 17 00:00:00 2001 +From e2cc24d6d8b7b24a6d0a30c52c7ad69a001a0ad5 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Tue, 18 Dec 2018 15:42:57 +0100 Subject: [PATCH] Don't set up arch/instruction-set flags, we do that diff --git a/meta/recipes-support/boost/boost/0001-dont-setup-compiler-flags-m32-m64.patch b/meta/recipes-support/boost/boost/0001-dont-setup-compiler-flags-m32-m64.patch index 8f130348b0..db1ee03898 100644 --- a/meta/recipes-support/boost/boost/0001-dont-setup-compiler-flags-m32-m64.patch +++ b/meta/recipes-support/boost/boost/0001-dont-setup-compiler-flags-m32-m64.patch @@ -1,4 +1,4 @@ -From 7130850d74863d1e9a0ae3e85462f1466bdf6d88 Mon Sep 17 00:00:00 2001 +From b0728812241c048907e6f1ba168292cd9948347d Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Thu, 14 Nov 2019 10:13:53 +0800 Subject: [PATCH] dont setup compiler flags -m32/-m64 diff --git a/meta/recipes-support/boost/boost/boost-math-disable-pch-for-gcc.patch b/meta/recipes-support/boost/boost/boost-math-disable-pch-for-gcc.patch index dde21fa076..ad90d96ddd 100644 --- a/meta/recipes-support/boost/boost/boost-math-disable-pch-for-gcc.patch +++ b/meta/recipes-support/boost/boost/boost-math-disable-pch-for-gcc.patch @@ -1,4 +1,4 @@ -From c6009cdc1fe76db0092443593396e4d5f0eaa86b Mon Sep 17 00:00:00 2001 +From e7491f9874411fd9855957812ba9bac948a61356 Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Fri, 23 Sep 2016 01:04:50 -0700 Subject: [PATCH] boost-math: disable pch for gcc @@ -14,11 +14,11 @@ Signed-off-by: Jackie Huang 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/math/build/Jamfile.v2 b/libs/math/build/Jamfile.v2 -index 6549e06b7..342cbf0b1 100644 +index 500c77363..504d7d8c6 100644 --- a/libs/math/build/Jamfile.v2 +++ b/libs/math/build/Jamfile.v2 -@@ -13,7 +13,7 @@ project - intel-win:-nologo +@@ -15,7 +15,7 @@ project + intel-win:-nologo #intel-linux:off intel-darwin:off - gcc,windows:off diff --git a/meta/recipes-support/boost/boost_1.86.0.bb b/meta/recipes-support/boost/boost_1.86.0.bb deleted file mode 100644 index 4b580d078b..0000000000 --- a/meta/recipes-support/boost/boost_1.86.0.bb +++ /dev/null @@ -1,7 +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 \ - " diff --git a/meta/recipes-support/boost/boost_1.87.0.bb b/meta/recipes-support/boost/boost_1.87.0.bb new file mode 100644 index 0000000000..4b580d078b --- /dev/null +++ b/meta/recipes-support/boost/boost_1.87.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