summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/rpm
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-25 10:05:56 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-25 12:44:13 +0000
commitc192bd60e8c7bcb9bbdd24158bd66eb691bfee5a (patch)
treea7fa8573dc667413ce712004bdde2ccec26ad5fe /meta/recipes-devtools/rpm
parent6df607bfd330111bf86e34e2fe9f16984267844d (diff)
downloadpoky-c192bd60e8c7bcb9bbdd24158bd66eb691bfee5a.tar.gz
Revert "xz: Allow to work with ASSUME_PROVIDED xz-native"
This reverts commit 5c69c561a76cb10d7896ae0a0399190f11b2e0ca. The change was incomplete, not handling cases such as the fetcher using xz, or linux-yocto, dpkg or apt or the lzma image type. (From OE-Core rev: fc4209baa098caebf9c4cb75f9a6f2e85f43333c) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/rpm')
-rw-r--r--meta/recipes-devtools/rpm/rpm_4.11.2.bb3
1 files changed, 0 insertions, 3 deletions
diff --git a/meta/recipes-devtools/rpm/rpm_4.11.2.bb b/meta/recipes-devtools/rpm/rpm_4.11.2.bb
index 6e46c8e999..3683971cd5 100644
--- a/meta/recipes-devtools/rpm/rpm_4.11.2.bb
+++ b/meta/recipes-devtools/rpm/rpm_4.11.2.bb
@@ -79,9 +79,6 @@ CCFLAGS_append = " -fPIC "
79CXXFLAGS_append = " -fPIC " 79CXXFLAGS_append = " -fPIC "
80CFLAGS_append = " -fPIC -DRPM_VENDOR_WINDRIVER -DRPM_VENDOR_POKY -DRPM_VENDOR_OE " 80CFLAGS_append = " -fPIC -DRPM_VENDOR_WINDRIVER -DRPM_VENDOR_POKY -DRPM_VENDOR_OE "
81 81
82BUILD_CFLAGS_append_class-native = " -L${STAGING_DIR_HOST}${libdir}/xz-native/"
83BUILD_LDFLAGS_append_class-native = " -Wl,-rpath,${STAGING_DIR_HOST}${libdir}/xz-native/ -Wl,-rpath-link,${STAGING_DIR_HOST}${libdir}/xz-native/"
84
85do_configure_prepend() { 82do_configure_prepend() {
86 rm -rf sqlite 83 rm -rf sqlite
87 rm -f m4/libtool.m4 84 rm -f m4/libtool.m4