diff options
| author |   Joe Slater <jslater@windriver.com> | 2017-10-13 15:40:25 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-11-08 22:24:04 +0000 |
| commit | bb2b7d2ed7112dc0e41b8e74f6f5d9adaefdddb4 (patch) | |
| tree | 97944df2fff0ea32dbab4be944468db04efceb2c /meta/recipes-devtools/rpm | |
| parent | 0c79f8d2381d424af8cf279840b7c04a95dec638 (diff) | |
| download | openembedded-core-contrib-bb2b7d2ed7112dc0e41b8e74f6f5d9adaefdddb4.tar.gz | |
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: 0ff69fc42b0ac2e7e865943e7febd87093da69d3)
Signed-off-by: Joe Slater <jslater@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/rpm')
| -rw-r--r-- | 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 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 +} |