From: Mark Hatle Date: Fri, 24 May 2013 15:22:02 +0000 (+0000) Subject: libarchive: Fix build dependencies X-Git-Tag: 2015-4~6361 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=d9f9bfed56ef8562256fc01c3e42e15734230c3a;p=openembedded-core.git libarchive: Fix build dependencies Move to using the PACKAGECONFIG mechanism to select configure options and dependencies. Without this the system will attempt to discover various dependencies, and usually does so incorrectly. We also ensure that the nativesdk version does not inherit any of the DISTRO_FEATURES. We shouldn't need acl or xattr support for nativesdk. Signed-off-by: Mark Hatle Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-extended/libarchive/libarchive_2.8.5.bb b/meta/recipes-extended/libarchive/libarchive_2.8.5.bb index 5cf13e6eb4..06989d3189 100644 --- a/meta/recipes-extended/libarchive/libarchive_2.8.5.bb +++ b/meta/recipes-extended/libarchive/libarchive_2.8.5.bb @@ -5,7 +5,25 @@ LICENSE = "BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=4255e2e6f0349a4ac8fbd68459296e46" PR = "r0" -DEPENDS = "libxml2" +PACKAGECONFIG ?= "libxml2 zlib bz2" + +PACKAGECONFIG_class-target += "\ + ${@base_contains('DISTRO_FEATURES', 'acl', 'acl', '', d)} \ + ${@base_contains('DISTRO_FEATURES', 'xattr', 'xattr', '', d)} \ + ${@base_contains('DISTRO_FEATURES', 'largefile', 'largefile', '', d)} \ +" + +PACKAGECONFIG_class-nativesdk += "largefile" + +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[xz] = "--with-lzmadec --with-lzma,--without-lzmadec --without-lzma,xz," +PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl," +PACKAGECONFIG[libxml2] = "--with-xml2,--without-xml2,libxml2," +PACKAGECONFIG[expat] = "--with-expat,--without-expat,expat," SRC_URI = "http://libarchive.googlecode.com/files/libarchive-${PV}.tar.gz \ file://0001-Patch-from-upstream-revision-1990.patch \