From 76772f36c4ae8e416b471abe883f117977803aac Mon Sep 17 00:00:00 2001 From: Patrick Ohly Date: Fri, 17 Feb 2017 17:14:10 +0100 Subject: libarchive: fix bzip2 dependency for native build When DEPENDS=bzip2 becomes bzip2-native in libarchive-native, the dependency ends up getting ignored because bzip2-native is in ASSUME_PROVIDED. But we need the library and thus have to depend on bzip2-replacement-native, otherwise the build proceeds without it despite the explicit --with-bz2lib. (From OE-Core rev: 7ae1c93ab6df46dc88b0ffaa52778738849ff38d) Signed-off-by: Patrick Ohly Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-extended/libarchive/libarchive_3.2.2.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'meta') diff --git a/meta/recipes-extended/libarchive/libarchive_3.2.2.bb b/meta/recipes-extended/libarchive/libarchive_3.2.2.bb index 8ad62adf01..a7c1204bd2 100644 --- a/meta/recipes-extended/libarchive/libarchive_3.2.2.bb +++ b/meta/recipes-extended/libarchive/libarchive_3.2.2.bb @@ -18,11 +18,14 @@ PACKAGECONFIG_append_class-target = "\ PACKAGECONFIG_append_class-nativesdk = " largefile" +DEPENDS_BZIP2 = "bzip2-replacement-native" +DEPENDS_BZIP2_class-target = "bzip2" + PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl," PACKAGECONFIG[xattr] = "--enable-xattr,--disable-xattr,attr," PACKAGECONFIG[largefile] = "--enable-largefile,--disable-largefile,," PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib," -PACKAGECONFIG[bz2] = "--with-bz2lib,--without-bz2lib,bzip2," +PACKAGECONFIG[bz2] = "--with-bz2lib,--without-bz2lib,${DEPENDS_BZIP2}," PACKAGECONFIG[xz] = "--with-lzmadec --with-lzma,--without-lzmadec --without-lzma,xz," PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl," PACKAGECONFIG[libxml2] = "--with-xml2,--without-xml2,libxml2," -- cgit 1.2.3-korg