diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2019-08-26 16:26:28 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-08-28 11:31:21 +0100 |
commit | 270a33863e1e221461f85fa6f6657c462db849a1 (patch) | |
tree | add24a7e864f52fefb0f91aac0e56ea1dec02109 /meta/recipes-support/boost/files | |
parent | 601c222f867bf3316ee9bdbee6f9eccb000c0042 (diff) | |
download | poky-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/recipes-support/boost/files')
3 files changed, 65 insertions, 50 deletions
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 @@ | |||
1 | From 19c117c3d1388654da484e26afb3fb6c3e4181a9 Mon Sep 17 00:00:00 2001 | ||
2 | From: Daniel Klauer <daniel.klauer@gin.de> | ||
3 | Date: Tue, 30 Jul 2019 11:39:09 +0200 | ||
4 | Subject: [PATCH] Build debug version of bjam | ||
5 | |||
6 | bjam is stripped by default, this causes QA warning while stripping it | ||
7 | from 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 | |||
13 | The JAM scripts allow to build unstripped version with '--debug'. Just | ||
14 | build and install the bjam.debug to stop bjam from being stripped in | ||
15 | compile step. | ||
16 | |||
17 | Upstream-Status: Inappropriate [configuration] | ||
18 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
19 | --- | ||
20 | bootstrap.sh | 2 +- | ||
21 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
22 | |||
23 | diff --git a/bootstrap.sh b/bootstrap.sh | ||
24 | index 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 | -- | ||
37 | 2.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 @@ | |||
1 | From 2afd025997a57794ce24e07e914b461dfea6ba5f Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Mon, 26 Aug 2019 16:04:16 +0200 | ||
4 | Subject: [PATCH] build.sh: use -DNDEBUG also in debug builds | ||
5 | |||
6 | Without it, there is a significant performance regression | ||
7 | when running 'bjam install'. | ||
8 | |||
9 | Upstream-Status: Inappropriate [configuration] | ||
10 | Signed-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 | |||
15 | diff --git a/tools/build/src/engine/build.sh b/tools/build/src/engine/build.sh | ||
16 | index 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 @@ | |||
1 | From 619ada314ab26c0c9cbfe5702cd9c0caa8f6415a Mon Sep 17 00:00:00 2001 | ||
2 | From: Wenzong Fan <wenzong.fan@windriver.com> | ||
3 | Date: Mon, 3 Aug 2015 17:12:33 +0800 | ||
4 | Subject: [PATCH] bjam-native: build bjam.debug | ||
5 | |||
6 | bjam is stripped by default, this causes QA warning while stripping it | ||
7 | from 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 | |||
13 | The JAM scripts allow to build unstripped version with '--debug'. Just | ||
14 | build and install the bjam.debug to stop bjam from being stripped in | ||
15 | compile step. | ||
16 | |||
17 | Upstream-Status: Inappropriate [configuration] | ||
18 | |||
19 | Signed-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 | |||
25 | diff --git a/bootstrap.sh b/bootstrap.sh | ||
26 | index 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 | |||
37 | diff --git a/tools/build/src/engine/build.sh b/tools/build/src/engine/build.sh | ||
38 | index 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 | -- | ||
49 | 1.9.1 | ||
50 | |||