summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex@linutronix.de>2024-08-22 11:34:53 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-08-23 09:12:37 +0100
commitd1826b22c1e1aaa9de40012e5fc9384e1c3a99dd (patch)
treeca96c951e2107c58634a7927be71618e7d9d1715
parent5fc95799406a61c574f80648b525b7894fdb8f0f (diff)
downloadpoky-d1826b22c1e1aaa9de40012e5fc9384e1c3a99dd.tar.gz
boost: upgrade 1.85.0 -> 1.86.0
(From OE-Core rev: 9ec3b3e91bd4c7b2ce09059424ddb2931a9af442) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/boost/boost-1.86.0.inc (renamed from meta/recipes-support/boost/boost-1.85.0.inc)2
-rw-r--r--meta/recipes-support/boost/boost-build-native_1.86.0.bb (renamed from meta/recipes-support/boost/boost-build-native_1.85.0.bb)4
-rw-r--r--meta/recipes-support/boost/boost/0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch6
-rw-r--r--meta/recipes-support/boost/boost/0001-dont-setup-compiler-flags-m32-m64.patch12
-rw-r--r--meta/recipes-support/boost/boost/boost-math-disable-pch-for-gcc.patch2
-rw-r--r--meta/recipes-support/boost/boost_1.86.0.bb (renamed from meta/recipes-support/boost/boost_1.85.0.bb)0
6 files changed, 14 insertions, 12 deletions
diff --git a/meta/recipes-support/boost/boost-1.85.0.inc b/meta/recipes-support/boost/boost-1.86.0.inc
index c2380bba6e..2378b27575 100644
--- a/meta/recipes-support/boost/boost-1.85.0.inc
+++ b/meta/recipes-support/boost/boost-1.86.0.inc
@@ -12,7 +12,7 @@ BOOST_MAJ = "${@"_".join(d.getVar("PV").split(".")[0:2])}"
12BOOST_P = "boost_${BOOST_VER}" 12BOOST_P = "boost_${BOOST_VER}"
13 13
14SRC_URI = "https://boostorg.jfrog.io/artifactory/main/release/${PV}/source/${BOOST_P}.tar.bz2" 14SRC_URI = "https://boostorg.jfrog.io/artifactory/main/release/${PV}/source/${BOOST_P}.tar.bz2"
15SRC_URI[sha256sum] = "7009fe1faa1697476bdc7027703a2badb84e849b7b0baad5086b087b971f8617" 15SRC_URI[sha256sum] = "1bed88e40401b2cb7a1f76d4bab499e352fa4d0c5f31c0dbae64e24d34d7513b"
16 16
17UPSTREAM_CHECK_URI = "http://www.boost.org/users/download/" 17UPSTREAM_CHECK_URI = "http://www.boost.org/users/download/"
18UPSTREAM_CHECK_REGEX = "release/(?P<pver>.*)/source/" 18UPSTREAM_CHECK_REGEX = "release/(?P<pver>.*)/source/"
diff --git a/meta/recipes-support/boost/boost-build-native_1.85.0.bb b/meta/recipes-support/boost/boost-build-native_1.86.0.bb
index b333c7c81a..764f410780 100644
--- a/meta/recipes-support/boost/boost-build-native_1.85.0.bb
+++ b/meta/recipes-support/boost/boost-build-native_1.86.0.bb
@@ -7,7 +7,7 @@ LICENSE = "BSL-1.0"
7LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c" 7LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c"
8 8
9SRC_URI = "git://github.com/boostorg/build;protocol=https;branch=master" 9SRC_URI = "git://github.com/boostorg/build;protocol=https;branch=master"
10SRCREV = "b0311a0d4f3bb0f93d06d3c6faca510c7f5a2012" 10SRCREV = "4a52d8c06635435b64e31a56eaf7ca5dc912a71d"
11PE = "1" 11PE = "1"
12 12
13UPSTREAM_CHECK_GITTAGREGEX = "boost-(?P<pver>(\d+(\.\d+)+))" 13UPSTREAM_CHECK_GITTAGREGEX = "boost-(?P<pver>(\d+(\.\d+)+))"
@@ -21,7 +21,7 @@ do_compile() {
21} 21}
22 22
23do_install() { 23do_install() {
24 HOME=/var/run ./b2 install --prefix=${prefix} staging-prefix=${D}${prefix} 24 HOME=/var/run ./b2 install --prefix=${D}${prefix}
25} 25}
26 26
27# The build is either release mode (pre-stripped) or debug (-O0). 27# The build is either release mode (pre-stripped) or debug (-O0).
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 fffc675b08..78f652f619 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 @@
1From 0130a1c0d8ba3c0d59258cb79e8b4a04fe6d8eec Mon Sep 17 00:00:00 2001 1From f88354966fe3af33fd6d9ec889a8e3926b886a8a Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Tue, 18 Dec 2018 15:42:57 +0100 3Date: Tue, 18 Dec 2018 15:42:57 +0100
4Subject: [PATCH] Don't set up arch/instruction-set flags, we do that 4Subject: [PATCH] Don't set up arch/instruction-set flags, we do that
@@ -13,10 +13,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
13 1 file changed, 153 deletions(-) 13 1 file changed, 153 deletions(-)
14 14
15diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam 15diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam
16index e5f8f53a4..0186545e8 100644 16index b7825d4e6..ed7e39baf 100644
17--- a/tools/build/src/tools/gcc.jam 17--- a/tools/build/src/tools/gcc.jam
18+++ b/tools/build/src/tools/gcc.jam 18+++ b/tools/build/src/tools/gcc.jam
19@@ -1111,156 +1111,3 @@ local rule cpu-flags ( toolset variable : architecture : instruction-set + : 19@@ -1144,156 +1144,3 @@ local rule cpu-flags ( toolset variable : architecture : instruction-set + :
20 <architecture>$(architecture)/<instruction-set>$(instruction-set) 20 <architecture>$(architecture)/<instruction-set>$(instruction-set)
21 : $(values) ; 21 : $(values) ;
22 } 22 }
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 1b01a04c6d..8f130348b0 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 @@
1From 9c3d6fa3544ca7bd6d8c4f4edbb62282cbc35861 Mon Sep 17 00:00:00 2001 1From 7130850d74863d1e9a0ae3e85462f1466bdf6d88 Mon Sep 17 00:00:00 2001
2From: Anuj Mittal <anuj.mittal@intel.com> 2From: Anuj Mittal <anuj.mittal@intel.com>
3Date: Thu, 14 Nov 2019 10:13:53 +0800 3Date: Thu, 14 Nov 2019 10:13:53 +0800
4Subject: [PATCH] dont setup compiler flags -m32/-m64 4Subject: [PATCH] dont setup compiler flags -m32/-m64
@@ -9,14 +9,14 @@ Upstream-Status: Inappropriate [OE-specific]
9 9
10Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> 10Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
11--- 11---
12 tools/build/src/tools/gcc.jam | 14 -------------- 12 tools/build/src/tools/gcc.jam | 16 ----------------
13 1 file changed, 14 deletions(-) 13 1 file changed, 16 deletions(-)
14 14
15diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam 15diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam
16index 0186545e8..ba33c4086 100644 16index ed7e39baf..90513f84a 100644
17--- a/tools/build/src/tools/gcc.jam 17--- a/tools/build/src/tools/gcc.jam
18+++ b/tools/build/src/tools/gcc.jam 18+++ b/tools/build/src/tools/gcc.jam
19@@ -360,20 +360,6 @@ local rule compile-link-flags ( * ) 19@@ -377,22 +377,6 @@ local rule compile-link-flags ( * )
20 compile-link-flags <link>shared/<target-os>$(non-windows) : -fPIC ; 20 compile-link-flags <link>shared/<target-os>$(non-windows) : -fPIC ;
21 } 21 }
22 22
@@ -29,6 +29,8 @@ index 0186545e8..ba33c4086 100644
29- compile-link-flags <target-os>hpux/<address-model>64 : -mlp64 ; 29- compile-link-flags <target-os>hpux/<address-model>64 : -mlp64 ;
30- 30-
31- local generic-os = [ set.difference $(all-os) : aix hpux ] ; 31- local generic-os = [ set.difference $(all-os) : aix hpux ] ;
32- compile-link-flags <target-os>$(generic-os)/<architecture>s390x/<address-model>32 : -m31 ;
33- compile-link-flags <target-os>$(generic-os)/<architecture>s390x/<address-model>64 : -m64 ;
32- local arch = power sparc x86 ; 34- local arch = power sparc x86 ;
33- compile-link-flags <target-os>$(generic-os)/<architecture>$(arch)/<address-model>32 : -m32 ; 35- compile-link-flags <target-os>$(generic-os)/<architecture>$(arch)/<address-model>32 : -m32 ;
34- compile-link-flags <target-os>$(generic-os)/<architecture>$(arch)/<address-model>64 : -m64 ; 36- compile-link-flags <target-os>$(generic-os)/<architecture>$(arch)/<address-model>64 : -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 9cb671e013..dde21fa076 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 @@
1From a61dd2b1336c06d232df58212ece88067e8a80bb Mon Sep 17 00:00:00 2001 1From c6009cdc1fe76db0092443593396e4d5f0eaa86b Mon Sep 17 00:00:00 2001
2From: Jackie Huang <jackie.huang@windriver.com> 2From: Jackie Huang <jackie.huang@windriver.com>
3Date: Fri, 23 Sep 2016 01:04:50 -0700 3Date: Fri, 23 Sep 2016 01:04:50 -0700
4Subject: [PATCH] boost-math: disable pch for gcc 4Subject: [PATCH] boost-math: disable pch for gcc
diff --git a/meta/recipes-support/boost/boost_1.85.0.bb b/meta/recipes-support/boost/boost_1.86.0.bb
index 4b580d078b..4b580d078b 100644
--- a/meta/recipes-support/boost/boost_1.85.0.bb
+++ b/meta/recipes-support/boost/boost_1.86.0.bb