summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Neumann <s.neumann@raumfeld.com>2009-10-23 07:53:12 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2009-10-23 08:15:11 (GMT)
commitdc5ae2c428d1012317653816f5001892574cd3ab (patch)
tree5400b521635585702db2ad6f1fda4907e30310d5
parentab17f403955a169a6ec9e8e16be6f1ce527b3f01 (diff)
downloadbuildroot-dc5ae2c428d1012317653816f5001892574cd3ab.tar.gz
buildroot-dc5ae2c428d1012317653816f5001892574cd3ab.tar.bz2
libarchive: add conditional dependency on zlib
If zlib is selected, then it should be built before libarchive so that libarchive picks up the headers and includes support for zlib compression. Signed-off-by: Sven Neumann <s.neumann@raumfeld.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/libarchive/libarchive.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk
index 32f68f7..efd1656 100644
--- a/package/libarchive/libarchive.mk
+++ b/package/libarchive/libarchive.mk
@@ -10,6 +10,10 @@ LIBARCHIVE_LIBTOOL_PATCH = NO
LIBARCHIVE_INSTALL_STAGING = YES
LIBARCHIVE_INSTALL_TARGET = YES
+ifeq ($(BR2_PACKAGE_ZLIB),y)
+LIBARCHIVE_DEPENDENCIES = zlib
+endif
+
LIBARCHIVE_CONF_OPT = \
$(if $(BR2_PACKAGE_LIBARCHIVE_BSDTAR),--enable-bsdtar,--disable-bsdtar) \
$(if $(BR2_PACKAGE_LIBARCHIVE_BSDCPIO),--enable-bsdcpio,--disable-bsdcpio)