summaryrefslogtreecommitdiffstats
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
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>
-rw-r--r--meta/recipes-devtools/rpm/rpm_4.11.2.bb3
-rw-r--r--meta/recipes-extended/pixz/pixz_1.0.6.bb4
-rw-r--r--meta/recipes-extended/xz/xz_5.2.2.bb3
3 files changed, 0 insertions, 10 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
diff --git a/meta/recipes-extended/pixz/pixz_1.0.6.bb b/meta/recipes-extended/pixz/pixz_1.0.6.bb
index 492b7ef611..279fb54c3f 100644
--- a/meta/recipes-extended/pixz/pixz_1.0.6.bb
+++ b/meta/recipes-extended/pixz/pixz_1.0.6.bb
@@ -1,7 +1,6 @@
1SUMMARY = "Parallel, indexed xz compressor" 1SUMMARY = "Parallel, indexed xz compressor"
2 2
3DEPENDS = "xz libarchive" 3DEPENDS = "xz libarchive"
4DEEPNDS_class-native = "xz-replacement-native libarchive-native"
5 4
6SRC_URI = "https://github.com/vasi/pixz/releases/download/v${PV}/${BPN}-${PV}.tar.xz" 5SRC_URI = "https://github.com/vasi/pixz/releases/download/v${PV}/${BPN}-${PV}.tar.xz"
7SRC_URI[md5sum] = "f6dc5909c9a31b192f69aa397ae8df48" 6SRC_URI[md5sum] = "f6dc5909c9a31b192f69aa397ae8df48"
@@ -18,7 +17,4 @@ CACHED_CONFIGUREVARS += "ac_cv_file_src_pixz_1=no"
18 17
19inherit autotools pkgconfig 18inherit autotools pkgconfig
20 19
21PKG_CONFIG_PATH_append_class-native = ":${STAGING_DIR_HOST}${libdir}/xz-native/pkgconfig"
22BUILD_LDFLAGS_append_class-native = " -Wl,-rpath,${STAGING_DIR_HOST}${libdir}/xz-native/"
23
24BBCLASSEXTEND = "native" 20BBCLASSEXTEND = "native"
diff --git a/meta/recipes-extended/xz/xz_5.2.2.bb b/meta/recipes-extended/xz/xz_5.2.2.bb
index 6acb33e859..d118f3a744 100644
--- a/meta/recipes-extended/xz/xz_5.2.2.bb
+++ b/meta/recipes-extended/xz/xz_5.2.2.bb
@@ -31,9 +31,6 @@ 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
37BBCLASSEXTEND = "native nativesdk" 34BBCLASSEXTEND = "native nativesdk"
38 35
39export CONFIG_SHELL="/bin/sh" 36export CONFIG_SHELL="/bin/sh"