Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
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>
This commit is contained in:
Michael Heimpold 2021-02-07 23:09:16 +01:00
parent d29ec52a58
commit d18692c926
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libs/libxml2/Makefile
View file

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