[OE-core] [PATCH v2] bjam-native: build and install bjam.debug

[wenzong fan]

Ping ...

Thanks
Wenzong

On 08/04/2015 10:33 AM, wenzong.fan at windriver.com wrote:
> From: Wenzong Fan <wenzong.fan at windriver.com>
>
> 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.
>
> Signed-off-by: Wenzong Fan <wenzong.fan at windriver.com>
> ---
>   meta/recipes-support/boost/bjam-native_1.58.0.bb   |  5 ++-
>   .../boost/files/bjam-native-build-bjam.debug.patch | 50 ++++++++++++++++++++++
>   2 files changed, 54 insertions(+), 1 deletion(-)
>   create mode 100644 meta/recipes-support/boost/files/bjam-native-build-bjam.debug.patch
>
> 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 d85d1a9..32646d7 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"
>
>   inherit native
>
> +SRC_URI += "file://bjam-native-build-bjam.debug.patch"
> +
>   do_compile() {
>       ./bootstrap.sh --with-toolset=gcc
>   }
>
>   do_install() {
>       install -d ${D}${bindir}/
> -    install -c -m 755 bjam ${D}${bindir}/
> +    # install unstripped version for bjam
> +    install -c -m 755 bjam.debug ${D}${bindir}/bjam
>   }
> 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 0000000..9f8b7ea
> --- /dev/null
> +++ b/meta/recipes-support/boost/files/bjam-native-build-bjam.debug.patch
> @@ -0,0 +1,50 @@
> +From 619ada314ab26c0c9cbfe5702cd9c0caa8f6415a Mon Sep 17 00:00:00 2001
> +From: Wenzong Fan <wenzong.fan at windriver.com>
> +Date: Mon, 3 Aug 2015 17:12:33 +0800
> +Subject: [PATCH] bjam-native: build 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.
> +
> +Upstream-Status: Inappropriate [configuration]
> +
> +Signed-off-by: Wenzong Fan <wenzong.fan at windriver.com>
> +---
> + bootstrap.sh                    | 1 +
> + tools/build/src/engine/build.sh | 2 +-
> + 2 files changed, 2 insertions(+), 1 deletion(-)
> +
> +diff --git a/bootstrap.sh b/bootstrap.sh
> +index 98cf88b..54690aa 100755
> +--- a/bootstrap.sh
> ++++ b/bootstrap.sh
> +@@ -228,6 +228,7 @@ if test "x$BJAM" = x; then
> +   echo "tools/build/src/engine/$arch/b2"
> +   cp "$BJAM" .
> +   cp "$my_dir/tools/build/src/engine/$arch/bjam" .
> ++  cp "$my_dir/tools/build/src/engine/${arch}.debug/bjam" bjam.debug
> +
> + fi
> +
> +diff --git a/tools/build/src/engine/build.sh b/tools/build/src/engine/build.sh
> +index 6dbc706..c69fdc7 100755
> +--- a/tools/build/src/engine/build.sh
> ++++ b/tools/build/src/engine/build.sh
> +@@ -312,5 +312,5 @@ if test -x "./bootstrap/jam0" ; then
> +     if test "${BJAM_UPDATE}" != "update" ; then
> +         echo_run ./bootstrap/jam0 -f build.jam --toolset=$BOOST_JAM_TOOLSET "--toolset-root=$BOOST_JAM_TOOLSET_ROOT" "$@" clean
> +     fi
> +-    echo_run ./bootstrap/jam0 -f build.jam --toolset=$BOOST_JAM_TOOLSET "--toolset-root=$BOOST_JAM_TOOLSET_ROOT" "$@"
> ++    echo_run ./bootstrap/jam0 -f build.jam --toolset=$BOOST_JAM_TOOLSET "--toolset-root=$BOOST_JAM_TOOLSET_ROOT" "$@" --debug
> + fi
> +--
> +1.9.1
> +
>