summaryrefslogtreecommitdiffstats
path: root/meta
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-24 09:40:33 +0000
commitd47572d3dd7ac442bd18205e8f740f2542814a23 (patch)
tree8f3f2495164604c2ccfc0df8fc4caa594e56e30a /meta
parent0aeb33f6e01f86321514afb85f0ccbaab3eac860 (diff)
downloadpoky-d47572d3dd7ac442bd18205e8f740f2542814a23.tar.gz
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). (From OE-Core rev: 5c69c561a76cb10d7896ae0a0399190f11b2e0ca) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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 "
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
82do_configure_prepend() { 85do_configure_prepend() {
83 rm -rf sqlite 86 rm -rf sqlite
84 rm -f m4/libtool.m4 87 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"
31 31
32FILES_liblzma = "${libdir}/liblzma*${SOLIBS}" 32FILES_liblzma = "${libdir}/liblzma*${SOLIBS}"
33 33
34PROVIDES_append_class-native = " xz-replacement-native"
35NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}"
36
34BBCLASSEXTEND = "native nativesdk" 37BBCLASSEXTEND = "native nativesdk"
35 38
36export CONFIG_SHELL="/bin/sh" 39export CONFIG_SHELL="/bin/sh"