From d18692c92638cdc1e643554699cb21e893abf2e9 Mon Sep 17 00:00:00 2001 From: Michael Heimpold Date: Sun, 7 Feb 2021 23:09:16 +0100 Subject: [PATCH] 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 Signed-off-by: Michael Heimpold --- libs/libxml2/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/libxml2/Makefile b/libs/libxml2/Makefile index 1430dc8f5..a9c9332fe 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 \