summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2013-05-24 15:22:02 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-05-30 20:59:13 +0100
commit0ef93c5ee9a0e35d993ec8c6b9d7e8ffcf767b4b (patch)
treee812beeba79af268c6edfe600f64be7f3d219b08
parentba319bbffa5e42612652b9a4fb79d232cfb4478a (diff)
downloadpoky-0ef93c5ee9a0e35d993ec8c6b9d7e8ffcf767b4b.tar.gz
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. (From OE-Core rev: d9f9bfed56ef8562256fc01c3e42e15734230c3a) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/libarchive/libarchive_2.8.5.bb20
1 files changed, 19 insertions, 1 deletions
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"
5LIC_FILES_CHKSUM = "file://COPYING;md5=4255e2e6f0349a4ac8fbd68459296e46" 5LIC_FILES_CHKSUM = "file://COPYING;md5=4255e2e6f0349a4ac8fbd68459296e46"
6PR = "r0" 6PR = "r0"
7 7
8DEPENDS = "libxml2" 8PACKAGECONFIG ?= "libxml2 zlib bz2"
9
10PACKAGECONFIG_class-target += "\
11 ${@base_contains('DISTRO_FEATURES', 'acl', 'acl', '', d)} \
12 ${@base_contains('DISTRO_FEATURES', 'xattr', 'xattr', '', d)} \
13 ${@base_contains('DISTRO_FEATURES', 'largefile', 'largefile', '', d)} \
14"
15
16PACKAGECONFIG_class-nativesdk += "largefile"
17
18PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl,"
19PACKAGECONFIG[xattr] = "--enable-xattr,--disable-xattr,attr,"
20PACKAGECONFIG[largefile] = "--enable-largefile,--disable-largefile,,"
21PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib,"
22PACKAGECONFIG[bz2] = "--with-bz2lib,--without-bz2lib,bzip2,"
23PACKAGECONFIG[xz] = "--with-lzmadec --with-lzma,--without-lzmadec --without-lzma,xz,"
24PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl,"
25PACKAGECONFIG[libxml2] = "--with-xml2,--without-xml2,libxml2,"
26PACKAGECONFIG[expat] = "--with-expat,--without-expat,expat,"
9 27
10SRC_URI = "http://libarchive.googlecode.com/files/libarchive-${PV}.tar.gz \ 28SRC_URI = "http://libarchive.googlecode.com/files/libarchive-${PV}.tar.gz \
11 file://0001-Patch-from-upstream-revision-1990.patch \ 29 file://0001-Patch-from-upstream-revision-1990.patch \