From 328201fe185b948eacceceefd9d2d2d0ba1ab676 Mon Sep 17 00:00:00 2001 From: Joe Slater Date: Fri, 13 Oct 2017 15:40:25 -0700 Subject: 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 Signed-off-by: Ross Burton Signed-off-by: Armin Kuster --- meta/recipes-devtools/rpm/rpm_git.bb | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'meta/recipes-devtools') diff --git a/meta/recipes-devtools/rpm/rpm_git.bb b/meta/recipes-devtools/rpm/rpm_git.bb index ea894a3470..7866314ad4 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 +} -- cgit 1.2.3-korg