From: Michael Heimpold <mhei@heimpold.de>
Date: Sun, 7 Feb 2021 22:09:16 +0000 (+0100)
Subject: libxml2: allow building with iconv support (fixes #14637)
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=d18692c92638cdc1e643554699cb21e893abf2e9;p=feed%2Fpackages.git

libxml2: allow building with iconv support (fixes #14637)

Instead of hard disabling iconv support, just rely on the global setting.

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
---

diff --git a/libs/libxml2/Makefile b/libs/libxml2/Makefile
index 1430dc8f53..a9c9332fe0 100644
--- a/libs/libxml2/Makefile
+++ b/libs/libxml2/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libxml2
 PKG_VERSION:=2.9.10
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://xmlsoft.org/sources/
@@ -27,13 +27,14 @@ PKG_BUILD_PARALLEL:=0
 
 include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
 define Package/libxml2
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=Gnome XML library
   URL:=http://xmlsoft.org/
-  DEPENDS:=+libpthread +zlib
+  DEPENDS:=+libpthread +zlib $(ICONV_DEPENDS)
 endef
 
 define Package/libxml2/description
@@ -80,7 +81,6 @@ CONFIGURE_ARGS += \
 	--with-html \
 	--without-ftp \
 	--without-http \
-	--without-iconv \
 	--without-iso8859x \
 	--without-legacy \
 	--with-output \