[gnome-continuous-yocto/gnomeostree-3.22-krogoth: 35/246] bitbake.conf/toolchain-scripts.bbclass: Remove debug prefix mappings in SDK

[Emmanuele Bassi <ebassi src gnome org>]

commit 7639be6851e57fe3d9358bb457d2db1a2d077ae2
Author: Jacob Kroon <jacob kroon gmail com>
Date:   Thu Jul 28 12:56:06 2016 +0200

    bitbake.conf/toolchain-scripts.bbclass: Remove debug prefix mappings in SDK
    
    CFLAGS/CXXFLAGS in the SDK environment script adds debug-prefix mappings
    that include staging area/work directories. Remove them since the SDK
    shouldn't be aware of them.
    
    (From OE-Core rev: 7918e73e9c5fe8c8c1c1d341eaa42f2f7d3ddb69)
    
    (From OE-Core rev: e52b98077e94e7071e70de28ed95092aad74d3ac)
    
    Signed-off-by: Jacob Kroon <jacob kroon gmail com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>
    Signed-off-by: Armin Kuster <akuster808 gmail com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/toolchain-scripts.bbclass |    3 +++
 meta/conf/bitbake.conf                 |    8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass
index 02e69c8..7053a14 100644
--- a/meta/classes/toolchain-scripts.bbclass
+++ b/meta/classes/toolchain-scripts.bbclass
@@ -6,6 +6,9 @@ REAL_MULTIMACH_TARGET_SYS ?= "${MULTIMACH_TARGET_SYS}"
 TARGET_CC_ARCH_append_libc-uclibc = " -muclibc"
 TARGET_CC_ARCH_append_libc-musl = " -mmusl"
 
+# default debug prefix map isn't valid in the SDK
+DEBUG_PREFIX_MAP = ""
+
 # This function creates an environment-setup-script for use in a deployable SDK
 toolchain_create_sdk_env_script () {
        # Create environment setup script
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index b623276..e0da14f 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -549,11 +549,11 @@ EXTRA_OEMAKE_prepend_task-install = "${PARALLEL_MAKEINST} "
 ##################################################################
 # Optimization flags.
 ##################################################################
-DEBUG_FLAGS ?= "-g -feliminate-unused-debug-types \
-                -fdebug-prefix-map=${WORKDIR}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} \
-                -fdebug-prefix-map=${STAGING_DIR_NATIVE}= \
-                -fdebug-prefix-map=${STAGING_DIR_HOST}= \
+DEBUG_PREFIX_MAP ?= "-fdebug-prefix-map=${WORKDIR}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} \
+                     -fdebug-prefix-map=${STAGING_DIR_NATIVE}= \
+                     -fdebug-prefix-map=${STAGING_DIR_HOST}= \
 "
+DEBUG_FLAGS ?= "-g -feliminate-unused-debug-types ${DEBUG_PREFIX_MAP}"
 
 # Disabled until the option works properly -feliminate-dwarf2-dups
 FULL_OPTIMIZATION = "-O2 -pipe ${DEBUG_FLAGS}"