summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2019-08-26 16:26:28 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-08-28 11:31:21 +0100
commit270a33863e1e221461f85fa6f6657c462db849a1 (patch)
treeadd24a7e864f52fefb0f91aac0e56ea1dec02109 /meta
parent601c222f867bf3316ee9bdbee6f9eccb000c0042 (diff)
downloadpoky-270a33863e1e221461f85fa6f6657c462db849a1.tar.gz
boost: update to 1.71.0
Some notes: - bjam bootstrap scripts were changed, and the patch for that had to be adjusted. tools/build/src/engine/build.sh now supports an --debug option which the bjam-native recipe can use to get the debug build of b2. - a related patch was added to address a speed regression with the debug version of bjam - gcc.jam patch had to be refreshed because boost added more "cpu-flags" lines. - since 1.70.0, boost includes new cmake config files which are packaged in ${PN}-dev now so they make it into the SDK. (although 1.71.0 is needed to fix some bugs in them) (From OE-Core rev: 810aded01fc2ae2c27c2573135c20947453e50c6) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/boost/bjam-native_1.71.0.bb (renamed from meta/recipes-support/boost/bjam-native_1.69.0.bb)7
-rw-r--r--meta/recipes-support/boost/boost-1.71.0.inc (renamed from meta/recipes-support/boost/boost-1.69.0.inc)6
-rw-r--r--meta/recipes-support/boost/boost.inc2
-rw-r--r--meta/recipes-support/boost/boost/0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch15
-rw-r--r--meta/recipes-support/boost/boost_1.71.0.bb (renamed from meta/recipes-support/boost/boost_1.69.0.bb)0
-rw-r--r--meta/recipes-support/boost/files/0001-Build-debug-version-of-bjam.patch38
-rw-r--r--meta/recipes-support/boost/files/0001-build.sh-use-DNDEBUG-also-in-debug-builds.patch27
-rw-r--r--meta/recipes-support/boost/files/bjam-native-build-bjam.debug.patch50
8 files changed, 83 insertions, 62 deletions
diff --git a/meta/recipes-support/boost/bjam-native_1.69.0.bb b/meta/recipes-support/boost/bjam-native_1.71.0.bb
index 94f96e62d8..d843eb038c 100644
--- a/meta/recipes-support/boost/bjam-native_1.69.0.bb
+++ b/meta/recipes-support/boost/bjam-native_1.71.0.bb
@@ -5,8 +5,9 @@ SECTION = "devel"
5 5
6inherit native 6inherit native
7 7
8SRC_URI += "file://bjam-native-build-bjam.debug.patch \ 8SRC_URI += "file://0001-Build-debug-version-of-bjam.patch \
9" 9 file://0001-build.sh-use-DNDEBUG-also-in-debug-builds.patch \
10 "
10 11
11do_compile() { 12do_compile() {
12 ./bootstrap.sh --with-toolset=gcc 13 ./bootstrap.sh --with-toolset=gcc
@@ -15,5 +16,5 @@ do_compile() {
15do_install() { 16do_install() {
16 install -d ${D}${bindir}/ 17 install -d ${D}${bindir}/
17 # install unstripped version for bjam 18 # install unstripped version for bjam
18 install -c -m 755 bjam.debug ${D}${bindir}/bjam 19 install -c -m 755 b2 ${D}${bindir}/bjam
19} 20}
diff --git a/meta/recipes-support/boost/boost-1.69.0.inc b/meta/recipes-support/boost/boost-1.71.0.inc
index 923436b1e0..7164d0f1c5 100644
--- a/meta/recipes-support/boost/boost-1.69.0.inc
+++ b/meta/recipes-support/boost/boost-1.71.0.inc
@@ -11,9 +11,9 @@ BOOST_VER = "${@"_".join(d.getVar("PV").split("."))}"
11BOOST_MAJ = "${@"_".join(d.getVar("PV").split(".")[0:2])}" 11BOOST_MAJ = "${@"_".join(d.getVar("PV").split(".")[0:2])}"
12BOOST_P = "boost_${BOOST_VER}" 12BOOST_P = "boost_${BOOST_VER}"
13 13
14SRC_URI = "${SOURCEFORGE_MIRROR}/project/boost/boost/${PV}/${BOOST_P}.tar.bz2" 14SRC_URI = "https://dl.bintray.com/boostorg/release/${PV}/source/${BOOST_P}.tar.bz2"
15SRC_URI[md5sum] = "a1332494397bf48332cb152abfefcec2" 15SRC_URI[md5sum] = "4cdf9b5c2dc01fb2b7b733d5af30e558"
16SRC_URI[sha256sum] = "8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406" 16SRC_URI[sha256sum] = "d73a8da01e8bf8c7eda40b4c84915071a8c8a0df4a6734537ddde4a8580524ee"
17 17
18UPSTREAM_CHECK_URI = "http://www.boost.org/users/download/" 18UPSTREAM_CHECK_URI = "http://www.boost.org/users/download/"
19UPSTREAM_CHECK_REGEX = "boostorg/release/(?P<pver>.*)/source/" 19UPSTREAM_CHECK_REGEX = "boostorg/release/(?P<pver>.*)/source/"
diff --git a/meta/recipes-support/boost/boost.inc b/meta/recipes-support/boost/boost.inc
index f385541653..e15dce4e1d 100644
--- a/meta/recipes-support/boost/boost.inc
+++ b/meta/recipes-support/boost/boost.inc
@@ -83,7 +83,7 @@ FILES_boost-test = "${libdir}/libboost_prg_exec_monitor*.so.* \
83 83
84# -dev last to pick up the remaining stuff 84# -dev last to pick up the remaining stuff
85PACKAGES += "${PN}-dev ${PN}-staticdev" 85PACKAGES += "${PN}-dev ${PN}-staticdev"
86FILES_${PN}-dev = "${includedir} ${libdir}/libboost_*.so" 86FILES_${PN}-dev = "${includedir} ${libdir}/libboost_*.so ${libdir}/cmake"
87FILES_${PN}-staticdev = "${libdir}/libboost_*.a" 87FILES_${PN}-staticdev = "${libdir}/libboost_*.a"
88 88
89# "boost" is a metapackage which pulls in all boost librabries 89# "boost" is a metapackage which pulls in all boost librabries
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 8944cb37b4..68d6e6417f 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 3e4eb02eb5951058bc6f8dffbf049eb189df8291 Mon Sep 17 00:00:00 2001 1From f4d3fad43d67808d71325ba0df1457555b9a0086 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 ourselves 4Subject: [PATCH] Don't set up arch/instruction-set flags, we do that ourselves
@@ -6,15 +6,16 @@ Subject: [PATCH] Don't set up arch/instruction-set flags, we do that ourselves
6Upstream-Status: Inappropriate 6Upstream-Status: Inappropriate
7Signed-off-by: Christopher Larson <chris_larson@mentor.com> 7Signed-off-by: Christopher Larson <chris_larson@mentor.com>
8Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 8Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
9
9--- 10---
10 tools/build/src/tools/gcc.jam | 128 ---------------------------------- 11 tools/build/src/tools/gcc.jam | 132 ----------------------------------
11 1 file changed, 128 deletions(-) 12 1 file changed, 132 deletions(-)
12 13
13diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam 14diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam
14index c57c773f..28618fb1 100644 15index b9bb9cf2a..c7e3cf3fe 100644
15--- a/tools/build/src/tools/gcc.jam 16--- a/tools/build/src/tools/gcc.jam
16+++ b/tools/build/src/tools/gcc.jam 17+++ b/tools/build/src/tools/gcc.jam
17@@ -1152,131 +1152,3 @@ local rule cpu-flags ( toolset variable : architecture : instruction-set + : 18@@ -1180,135 +1180,3 @@ local rule cpu-flags ( toolset variable : architecture : instruction-set + :
18 <architecture>$(architecture)/<instruction-set>$(instruction-set) 19 <architecture>$(architecture)/<instruction-set>$(instruction-set)
19 : $(values) ; 20 : $(values) ;
20 } 21 }
@@ -144,5 +145,9 @@ index c57c773f..28618fb1 100644
144-cpu-flags gcc OPTIONS : power : rios2 : -mcpu=rios2 ; 145-cpu-flags gcc OPTIONS : power : rios2 : -mcpu=rios2 ;
145-cpu-flags gcc OPTIONS : power : rsc : -mcpu=rsc ; 146-cpu-flags gcc OPTIONS : power : rsc : -mcpu=rsc ;
146-cpu-flags gcc OPTIONS : power : rs64a : -mcpu=rs64 ; 147-cpu-flags gcc OPTIONS : power : rs64a : -mcpu=rs64 ;
148-cpu-flags gcc OPTIONS : s390x : z196 : -march=z196 ;
149-cpu-flags gcc OPTIONS : s390x : zEC12 : -march=zEC12 ;
150-cpu-flags gcc OPTIONS : s390x : z13 : -march=z13 ;
151-cpu-flags gcc OPTIONS : s390x : z14 : -march=z14 ;
147-# AIX variant of RS/6000 & PowerPC 152-# AIX variant of RS/6000 & PowerPC
148-toolset.flags gcc AROPTIONS <address-model>64/<target-os>aix : "-X64" ; 153-toolset.flags gcc AROPTIONS <address-model>64/<target-os>aix : "-X64" ;
diff --git a/meta/recipes-support/boost/boost_1.69.0.bb b/meta/recipes-support/boost/boost_1.71.0.bb
index 324b46f168..324b46f168 100644
--- a/meta/recipes-support/boost/boost_1.69.0.bb
+++ b/meta/recipes-support/boost/boost_1.71.0.bb
diff --git a/meta/recipes-support/boost/files/0001-Build-debug-version-of-bjam.patch b/meta/recipes-support/boost/files/0001-Build-debug-version-of-bjam.patch
new file mode 100644
index 0000000000..c6dcee915e
--- /dev/null
+++ b/meta/recipes-support/boost/files/0001-Build-debug-version-of-bjam.patch
@@ -0,0 +1,38 @@
1From 19c117c3d1388654da484e26afb3fb6c3e4181a9 Mon Sep 17 00:00:00 2001
2From: Daniel Klauer <daniel.klauer@gin.de>
3Date: Tue, 30 Jul 2019 11:39:09 +0200
4Subject: [PATCH] Build debug version of bjam
5
6bjam is stripped by default, this causes QA warning while stripping it
7from do_populate_sysroot():
8
9 WARNING: File '.../tmp/sysroots/x86_64-linux/usr/bin/bjam' \
10 from bjam-native was already stripped, \
11 this will prevent future debugging!
12
13The JAM scripts allow to build unstripped version with '--debug'. Just
14build and install the bjam.debug to stop bjam from being stripped in
15compile step.
16
17Upstream-Status: Inappropriate [configuration]
18Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
19---
20 bootstrap.sh | 2 +-
21 1 file changed, 1 insertion(+), 1 deletion(-)
22
23diff --git a/bootstrap.sh b/bootstrap.sh
24index ca0b08d58..87f38dcf2 100755
25--- a/bootstrap.sh
26+++ b/bootstrap.sh
27@@ -223,7 +223,7 @@ rm -f config.log
28 if test "x$BJAM" = x; then
29 $ECHO -n "Building Boost.Build engine with toolset $TOOLSET... "
30 pwd=`pwd`
31- (cd "$my_dir/tools/build/src/engine" && ./build.sh "$TOOLSET") > bootstrap.log 2>&1
32+ (cd "$my_dir/tools/build/src/engine" && ./build.sh "$TOOLSET" --debug) > bootstrap.log 2>&1
33 if [ $? -ne 0 ]; then
34 echo
35 echo "Failed to build Boost.Build build engine"
36--
372.17.1
38
diff --git a/meta/recipes-support/boost/files/0001-build.sh-use-DNDEBUG-also-in-debug-builds.patch b/meta/recipes-support/boost/files/0001-build.sh-use-DNDEBUG-also-in-debug-builds.patch
new file mode 100644
index 0000000000..4c6ef2ed84
--- /dev/null
+++ b/meta/recipes-support/boost/files/0001-build.sh-use-DNDEBUG-also-in-debug-builds.patch
@@ -0,0 +1,27 @@
1From 2afd025997a57794ce24e07e914b461dfea6ba5f Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Mon, 26 Aug 2019 16:04:16 +0200
4Subject: [PATCH] build.sh: use -DNDEBUG also in debug builds
5
6Without it, there is a significant performance regression
7when running 'bjam install'.
8
9Upstream-Status: Inappropriate [configuration]
10Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
11---
12 tools/build/src/engine/build.sh | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/tools/build/src/engine/build.sh b/tools/build/src/engine/build.sh
16index a1e4cd335..64e0a4c80 100755
17--- a/tools/build/src/engine/build.sh
18+++ b/tools/build/src/engine/build.sh
19@@ -436,7 +436,7 @@ case $B2_OS in
20 ;;
21 esac
22
23-if check_debug_build "$@" ; then B2_CXXFLAGS="${B2_CXXFLAGS_DEBUG}"
24+if check_debug_build "$@" ; then B2_CXXFLAGS="${B2_CXXFLAGS_DEBUG} -DNDEBUG"
25 else B2_CXXFLAGS="${B2_CXXFLAGS_RELEASE} -DNDEBUG"
26 fi
27 echo_run ${B2_CXX} ${CXXFLAGS} ${B2_CXXFLAGS} ${B2_SOURCES} -o b2
diff --git a/meta/recipes-support/boost/files/bjam-native-build-bjam.debug.patch b/meta/recipes-support/boost/files/bjam-native-build-bjam.debug.patch
deleted file mode 100644
index 9f8b7eac0a..0000000000
--- a/meta/recipes-support/boost/files/bjam-native-build-bjam.debug.patch
+++ /dev/null
@@ -1,50 +0,0 @@
1From 619ada314ab26c0c9cbfe5702cd9c0caa8f6415a Mon Sep 17 00:00:00 2001
2From: Wenzong Fan <wenzong.fan@windriver.com>
3Date: Mon, 3 Aug 2015 17:12:33 +0800
4Subject: [PATCH] bjam-native: build bjam.debug
5
6bjam is stripped by default, this causes QA warning while stripping it
7from do_populate_sysroot():
8
9 WARNING: File '.../tmp/sysroots/x86_64-linux/usr/bin/bjam' \
10 from bjam-native was already stripped, \
11 this will prevent future debugging!
12
13The JAM scripts allow to build unstripped version with '--debug'. Just
14build and install the bjam.debug to stop bjam from being stripped in
15compile step.
16
17Upstream-Status: Inappropriate [configuration]
18
19Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
20---
21 bootstrap.sh | 1 +
22 tools/build/src/engine/build.sh | 2 +-
23 2 files changed, 2 insertions(+), 1 deletion(-)
24
25diff --git a/bootstrap.sh b/bootstrap.sh
26index 98cf88b..54690aa 100755
27--- a/bootstrap.sh
28+++ b/bootstrap.sh
29@@ -228,6 +228,7 @@ if test "x$BJAM" = x; then
30 echo "tools/build/src/engine/$arch/b2"
31 cp "$BJAM" .
32 cp "$my_dir/tools/build/src/engine/$arch/bjam" .
33+ cp "$my_dir/tools/build/src/engine/${arch}.debug/bjam" bjam.debug
34
35 fi
36
37diff --git a/tools/build/src/engine/build.sh b/tools/build/src/engine/build.sh
38index 6dbc706..c69fdc7 100755
39--- a/tools/build/src/engine/build.sh
40+++ b/tools/build/src/engine/build.sh
41@@ -312,5 +312,5 @@ if test -x "./bootstrap/jam0" ; then
42 if test "${BJAM_UPDATE}" != "update" ; then
43 echo_run ./bootstrap/jam0 -f build.jam --toolset=$BOOST_JAM_TOOLSET "--toolset-root=$BOOST_JAM_TOOLSET_ROOT" "$@" clean
44 fi
45- echo_run ./bootstrap/jam0 -f build.jam --toolset=$BOOST_JAM_TOOLSET "--toolset-root=$BOOST_JAM_TOOLSET_ROOT" "$@"
46+ echo_run ./bootstrap/jam0 -f build.jam --toolset=$BOOST_JAM_TOOLSET "--toolset-root=$BOOST_JAM_TOOLSET_ROOT" "$@" --debug
47 fi
48--
491.9.1
50