summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support
diff options
context:
space:
mode:
authorWenzong Fan <wenzong.fan@windriver.com>2015-08-04 10:33:11 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-12 22:48:36 +0100
commit18aaf65b04e4a09f432d3a5e5b6288e0ff4237f8 (patch)
treef7db3ac6d2a07e714fa5eabd283db66ad1481d3f /meta/recipes-support
parent1f868877f109c692fcb8889d1acef09264eaa1ae (diff)
downloadpoky-18aaf65b04e4a09f432d3a5e5b6288e0ff4237f8.tar.gz
bjam-native: build and install bjam.debug
bjam is stripped by default, this causes QA warning while stripping it from do_populate_sysroot(): WARNING: File '.../tmp/sysroots/x86_64-linux/usr/bin/bjam' \ from bjam-native was already stripped, \ this will prevent future debugging! The JAM scripts allow to build unstripped version with '--debug'. Just build and install the bjam.debug to stop bjam from being stripped in compile step. (From OE-Core rev: e7147de9f28925b1bb5df39d9c0848dd7957328c) Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r--meta/recipes-support/boost/bjam-native_1.58.0.bb5
-rw-r--r--meta/recipes-support/boost/files/bjam-native-build-bjam.debug.patch50
2 files changed, 54 insertions, 1 deletions
diff --git a/meta/recipes-support/boost/bjam-native_1.58.0.bb b/meta/recipes-support/boost/bjam-native_1.58.0.bb
index d85d1a96cb..32646d707b 100644
--- a/meta/recipes-support/boost/bjam-native_1.58.0.bb
+++ b/meta/recipes-support/boost/bjam-native_1.58.0.bb
@@ -5,11 +5,14 @@ SECTION = "devel"
5 5
6inherit native 6inherit native
7 7
8SRC_URI += "file://bjam-native-build-bjam.debug.patch"
9
8do_compile() { 10do_compile() {
9 ./bootstrap.sh --with-toolset=gcc 11 ./bootstrap.sh --with-toolset=gcc
10} 12}
11 13
12do_install() { 14do_install() {
13 install -d ${D}${bindir}/ 15 install -d ${D}${bindir}/
14 install -c -m 755 bjam ${D}${bindir}/ 16 # install unstripped version for bjam
17 install -c -m 755 bjam.debug ${D}${bindir}/bjam
15} 18}
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
new file mode 100644
index 0000000000..9f8b7eac0a
--- /dev/null
+++ b/meta/recipes-support/boost/files/bjam-native-build-bjam.debug.patch
@@ -0,0 +1,50 @@
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