[gnome-continuous-yocto/gnomeostree-3.28-rocko: 7454/8267] bash.inc: improve reproducibility

[Emmanuele Bassi <ebassi src gnome org>]

commit dabbfe23de0615a958fac31b83684ade024cf17d
Author: Juro Bystricky <juro bystricky intel com>
Date:   Mon Aug 28 13:28:20 2017 -0700

    bash.inc: improve reproducibility
    
    Remove all host build references from the following bash packages:
    bash-ptest, bash-bashbug, bash-dev, bash-loadable.
    
    [YOCTO #11918]
    
    (From OE-Core rev: 26a29d85648b68bb1d2badd59de76f850054e059)
    
    Signed-off-by: Juro Bystricky <juro bystricky intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/recipes-extended/bash/bash.inc |   22 +++++++++++++++++++---
 1 files changed, 19 insertions(+), 3 deletions(-)
---
diff --git a/meta/recipes-extended/bash/bash.inc b/meta/recipes-extended/bash/bash.inc
index 92916d9..f6cb7e4 100644
--- a/meta/recipes-extended/bash/bash.inc
+++ b/meta/recipes-extended/bash/bash.inc
@@ -48,16 +48,32 @@ do_install_append () {
        fi
 }
 do_install_append_class-target () {
-       # Clean host path in bashbug
+       # Clean buildhost references in bashbug
        sed -i -e "s,--sysroot=${STAGING_DIR_TARGET},,g" \
-               -e "s,-I${WORKDIR}/\S* ,,g" ${D}${bindir}/bashbug
+               -e "s,-I${WORKDIR}/\S* ,,g" \
+               -e 's|${DEBUG_PREFIX_MAP}||g' \
+               ${D}${bindir}/bashbug
+
+       # Clean buildhost references in bash.pc
+       sed -i -e "s,--sysroot=${STAGING_DIR_TARGET},,g" \
+            ${D}${libdir}/pkgconfig/bash.pc
+
+       # Clean buildhost references in Makefile.inc
+       sed -i -e "s,--sysroot=${STAGING_DIR_TARGET},,g" \
+               -e 's|${DEBUG_PREFIX_MAP}||g' \
+               -e 's:${HOSTTOOLS_DIR}/::g' \
+               -e 's:${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}::g' \
+               ${D}${libdir}/bash/Makefile.inc
 }
 
 do_install_ptest () {
        make INSTALL_TEST_DIR=${D}${PTEST_PATH}/tests install-test
        cp ${B}/Makefile ${D}${PTEST_PATH}
         sed -i -e 's/^Makefile/_Makefile/' -e "s,--sysroot=${STAGING_DIR_TARGET},,g" \
-           -e "s,${S},,g" -e "s,${B},,g" -e "s,${STAGING_DIR_NATIVE},,g" ${D}${PTEST_PATH}/Makefile
+           -e 's|${DEBUG_PREFIX_MAP}||g' \
+           -e "s,${S},,g" -e "s,${B},,g" -e "s,${STAGING_DIR_NATIVE},,g" \
+           -e 's:${HOSTTOOLS_DIR}/::g' \
+            ${D}${PTEST_PATH}/Makefile
 }
 
 pkg_postinst_${PN} () {