summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2011-07-10 19:52:52 +0200
committerPeter Korsgaard <jacmet@sunsite.dk>2011-07-10 20:15:54 +0200
commit9eb70889bc7ec28790ac488a8edf5cd4404c2467 (patch)
tree196ce63137c1e1b8d22cb7f269dd030783ae6473
parentec0b51648b68de94f715fadef9a3a9085c15e22a (diff)
libarchive: add optional libxml2 support
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/libarchive/libarchive.mk8
1 files changed, 7 insertions, 1 deletions
diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk
index 563c9d7bc..d53904768 100644
--- a/package/libarchive/libarchive.mk
+++ b/package/libarchive/libarchive.mk
@@ -14,8 +14,14 @@ LIBARCHIVE_DEPENDENCIES = zlib
endif
LIBARCHIVE_CONF_OPT = \
- --without-xml2 \
$(if $(BR2_PACKAGE_LIBARCHIVE_BSDTAR),--enable-bsdtar,--disable-bsdtar) \
$(if $(BR2_PACKAGE_LIBARCHIVE_BSDCPIO),--enable-bsdcpio,--disable-bsdcpio)
+ifeq ($(BR2_PACKAGE_LIBXML2),y)
+LIBARCHIVE_DEPENDENCIES += libxml2
+LIBARCHIVE_CONF_ENV += XML2_CONFIG=$(STAGING_DIR)/usr/bin/xml2-config
+else
+LIBARCHIVE_CONF_OPT += --without-xml2
+endif
+
$(eval $(call AUTOTARGETS,package,libarchive))