rpm: remove --sysroot from macros on target

We do not want to specify --sysroot when defining __cc
used on a target.

Signed-off-by: Joe Slater <jslater@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>

diff --git a/meta/recipes-devtools/rpm/rpm_git.bb b/meta/recipes-devtools/rpm/rpm_git.bb
index ea894a3470d14a3c1b642d0bffcd1c65045b88ca..7866314ad4b9507b52f39ae2ae9e1b74729c42a3 100644 (file)
--- 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
+}