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>

diff --git a/meta/recipes-devtools/rpm/rpm_4.11.2.bb b/meta/recipes-devtools/rpm/rpm_4.11.2.bb
index 3683971cd52b7d3b17165c3c4b2435da1767e8a0..6e46c8e999653f0c63cc3a46b82cdd4e1521c9fb 100644 (file)
--- 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 d118f3a7448f9a2e67ba67812f5d713dc53e6f62..6acb33e859677d4badf6895044c32f79f828af2f 100644 (file)
--- 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"