summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-22 12:59:35 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-23 23:04:40 +0000
commit5c69c561a76cb10d7896ae0a0399190f11b2e0ca (patch)
treed341a45763c16b7c1293066a1768f4d4c5cfc0eb
parentf971ae290cbbc51ec3669b57c55b2b7c0bd9bc87 (diff)
downloadopenembedded-core-5c69c561a76cb10d7896ae0a0399190f11b2e0ca.tar.gz
openembedded-core-5c69c561a76cb10d7896ae0a0399190f11b2e0ca.tar.bz2
openembedded-core-5c69c561a76cb10d7896ae0a0399190f11b2e0ca.zip
xz: Allow to work with ASSUME_PROVIDED xz-native
At some point we may want to add xz-native to ASSUME_PROVIDED. This allows that to work whilst still allowing access to liblzma for those things which need it (e.g. pixz). Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/rpm/rpm_4.11.2.bb3
-rw-r--r--meta/recipes-extended/xz/xz_5.2.2.bb3
2 files changed, 6 insertions, 0 deletions
diff --git a/meta/recipes-devtools/rpm/rpm_4.11.2.bb b/meta/recipes-devtools/rpm/rpm_4.11.2.bb
index 3683971cd5..6e46c8e999 100644
--- a/meta/recipes-devtools/rpm/rpm_4.11.2.bb
+++ b/meta/recipes-devtools/rpm/rpm_4.11.2.bb
@@ -79,6 +79,9 @@ CCFLAGS_append = " -fPIC "
CXXFLAGS_append = " -fPIC "
CFLAGS_append = " -fPIC -DRPM_VENDOR_WINDRIVER -DRPM_VENDOR_POKY -DRPM_VENDOR_OE "
+BUILD_CFLAGS_append_class-native = " -L${STAGING_DIR_HOST}${libdir}/xz-native/"
+BUILD_LDFLAGS_append_class-native = " -Wl,-rpath,${STAGING_DIR_HOST}${libdir}/xz-native/ -Wl,-rpath-link,${STAGING_DIR_HOST}${libdir}/xz-native/"
+
do_configure_prepend() {
rm -rf sqlite
rm -f m4/libtool.m4
diff --git a/meta/recipes-extended/xz/xz_5.2.2.bb b/meta/recipes-extended/xz/xz_5.2.2.bb
index d118f3a744..6acb33e859 100644
--- a/meta/recipes-extended/xz/xz_5.2.2.bb
+++ b/meta/recipes-extended/xz/xz_5.2.2.bb
@@ -31,6 +31,9 @@ PACKAGES =+ "liblzma"
FILES_liblzma = "${libdir}/liblzma*${SOLIBS}"
+PROVIDES_append_class-native = " xz-replacement-native"
+NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}"
+
BBCLASSEXTEND = "native nativesdk"
export CONFIG_SHELL="/bin/sh"