lede-packages-rs

commit 251c1867e669606671656502bd5119d21c440dd8
parent 3424ffc8d209140e19d3cd822c82ed499d412c5b
Author: kuoruan <kuoruan@gmail.com>
Date:   Mon, 30 May 2016 10:17:24 +0800

aria2: Add xml library choice

Signed-off-by: Hsing-Wang Liao <kuoruan@gmail.com>

Diffstat:
M
net/aria2/Config.in
 | 
13
+++++++++++++
M
net/aria2/Makefile
 | 
10
++++++----

2 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/net/aria2/Config.in b/net/aria2/Config.in
@@ -25,4 +25,17 @@ config ARIA2_METALINK
 	bool "Enable metalink support"
 	default N
 
+choice
+	prompt "XML library"
+	default ARIA2_EXPAT
+	depends on ARIA2_METALINK
+
+config ARIA2_EXPAT
+	bool "EXPAT"
+
+config ARIA2_LIBXML2
+	bool "LIBXML2"
+
+endchoice
+
 endmenu
diff --git a/net/aria2/Makefile b/net/aria2/Makefile
@@ -24,7 +24,9 @@ PKG_CONFIG_DEPENDS := \
   ARIA2_OPENSSL \
   ARIA2_GNUTLS \
   ARIA2_BITTORRENT \
-  ARIA2_METALINK
+  ARIA2_METALINK \
+  ARIA2_EXPAT \
+  ARIA2_LIBXML2
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -38,7 +40,7 @@ define Package/aria2
   SUBMENU:=File Transfer
   TITLE:=lightweight download utility
   URL:=http://aria2.sourceforge.net/
-  DEPENDS:=+zlib +ARIA2_METALINK:libxml2 +libstdcpp +ARIA2_OPENSSL:libopenssl +ARIA2_GNUTLS:libgnutls
+  DEPENDS:=+zlib +ARIA2_LIBXML2:libxml2 +ARIA2_EXPAT:libexpat +libstdcpp +ARIA2_OPENSSL:libopenssl +ARIA2_GNUTLS:libgnutls
 endef
 
 define Package/aria2/description
@@ -53,11 +55,11 @@ CONFIGURE_ARGS += \
 	$(if $(CONFIG_ARIA2_GNUTLS),--with,--without)-gnutls \
 	$(if $(CONFIG_ARIA2_BITTORRENT),--enable,--disable)-bittorrent \
 	$(if $(CONFIG_ARIA2_METALINK),--enable,--disable)-metalink \
-	$(if $(CONFIG_ARIA2_METALINK),--with,--without)-libxml2 \
+	$(if $(CONFIG_ARIA2_LIBXML2),--with,--without)-libxml2 \
+	$(if $(CONFIG_ARIA2_EXPAT),--with,--without)-libexpat \
 	--without-libnettle \
 	--without-libgmp \
 	--without-libgcrypt \
-	--without-libexpat \
 	--without-libcares \
 	--without-sqlite3 \
 	--with-libz