diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-25 10:05:56 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-25 10:08:25 +0000 |
| commit | fc4209baa098caebf9c4cb75f9a6f2e85f43333c (patch) | |
| tree | f2a4dffc983f06f393a7111442e0721cf2ca594b | |
| parent | 9590dd6c89d6d99419cc0f0619ac4fe854150c9b (diff) | |
| download | openembedded-core-fc4209baa098caebf9c4cb75f9a6f2e85f43333c.tar.gz openembedded-core-fc4209baa098caebf9c4cb75f9a6f2e85f43333c.tar.bz2 openembedded-core-fc4209baa098caebf9c4cb75f9a6f2e85f43333c.zip | |
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>
| -rw-r--r-- | meta/recipes-devtools/rpm/rpm_4.11.2.bb | 3 | ||||
| -rw-r--r-- | meta/recipes-extended/pixz/pixz_1.0.6.bb | 4 | ||||
| -rw-r--r-- | meta/recipes-extended/xz/xz_5.2.2.bb | 3 |
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 " 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/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" |