[gnome-continuous-yocto/gnomeostree-3.28-rocko: 8178/8267] rpm: remove --sysroot from macros on target

[Emmanuele Bassi <ebassi src gnome org>]

commit 8d706de096f20de7fb25f4bde9296b03399029b8
Author: Joe Slater <jslater windriver com>
Date:   Fri Oct 13 15:40:25 2017 -0700

    rpm: remove --sysroot from macros on target
    
    We do not want to specify --sysroot when defining __cc
    used on a target.
    
    (From OE-Core rev: 328201fe185b948eacceceefd9d2d2d0ba1ab676)
    
    Signed-off-by: Joe Slater <jslater windriver com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Armin Kuster <akuster mvista com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/recipes-devtools/rpm/rpm_git.bb |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)
---
diff --git a/meta/recipes-devtools/rpm/rpm_git.bb b/meta/recipes-devtools/rpm/rpm_git.bb
index ea894a3..7866314 100644
--- a/meta/recipes-devtools/rpm/rpm_git.bb
+++ b/meta/recipes-devtools/rpm/rpm_git.bb
@@ -107,7 +107,8 @@ do_install_append_class-target() {
 }
 
 do_install_append () {
-       sed -i -e 's:${HOSTTOOLS_DIR}/::g' ${D}/${libdir}/rpm/macros
+       sed -i -e 's:${HOSTTOOLS_DIR}/::g' \
+           ${D}/${libdir}/rpm/macros
 
        sed -i -e 's|/usr/bin/python|${USRBINPATH}/env ${PYTHON_PN}|' \
            ${D}${libdir}/rpm/pythondistdeps.py
@@ -127,3 +128,11 @@ FILES_python3-rpm = "${PYTHON_SITEPACKAGES_DIR}/rpm/*"
 RPROVIDES_${PN} += "rpm-build"
 
 RDEPENDS_${PN} = "bash perl python3-core"
+
+PACKAGE_PREPROCESS_FUNCS += "rpm_package_preprocess"
+
+# Do not specify a sysroot when compiling on a target.
+rpm_package_preprocess () {
+       sed -i -e 's:--sysroot[^ ]*::g' \
+           ${PKGD}/${libdir}/rpm/macros
+}