From fc4209baa098caebf9c4cb75f9a6f2e85f43333c Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Mon, 25 Jan 2016 10:05:56 +0000
Subject: 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.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-extended/pixz/pixz_1.0.6.bb | 4 ----
 meta/recipes-extended/xz/xz_5.2.2.bb     | 3 ---
 2 files changed, 7 deletions(-)

(limited to 'meta/recipes-extended')

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 @@
 SUMMARY = "Parallel, indexed xz compressor"
 
 DEPENDS = "xz libarchive"
-DEEPNDS_class-native = "xz-replacement-native libarchive-native"
 
 SRC_URI = "https://github.com/vasi/pixz/releases/download/v${PV}/${BPN}-${PV}.tar.xz"
 SRC_URI[md5sum] = "f6dc5909c9a31b192f69aa397ae8df48"
@@ -18,7 +17,4 @@ CACHED_CONFIGUREVARS += "ac_cv_file_src_pixz_1=no"
 
 inherit autotools pkgconfig
 
-PKG_CONFIG_PATH_append_class-native = ":${STAGING_DIR_HOST}${libdir}/xz-native/pkgconfig"
-BUILD_LDFLAGS_append_class-native = " -Wl,-rpath,${STAGING_DIR_HOST}${libdir}/xz-native/"
-
 BBCLASSEXTEND = "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"
 
 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"
-- 
cgit 1.2.3-korg