From 2780fb8af503040e38065b56cf39988aab644c9c Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 16 Jan 2012 12:33:17 +0100 Subject: [PATCH] libxml2: make build with libiconv optional Signed-off-by: Stephan Raue --- packages/textproc/libxml2/build | 6 +++++- packages/textproc/libxml2/meta | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/packages/textproc/libxml2/build b/packages/textproc/libxml2/build index cb827c7cb6..4a92467523 100755 --- a/packages/textproc/libxml2/build +++ b/packages/textproc/libxml2/build @@ -22,6 +22,10 @@ . config/options $1 +if [ "$ICONV" = "libiconv" ]; then + CONFIG_LIBXML="--with-iconv" +fi + cd $PKG_BUILD mkdir -p .build-target @@ -32,7 +36,7 @@ cd .build-target --sysconfdir=/etc \ --enable-static \ --enable-shared \ - --with-iconv \ + $CONFIG_LIBXML \ --disable-ipv6 \ --without-python \ --with-zlib diff --git a/packages/textproc/libxml2/meta b/packages/textproc/libxml2/meta index ffdd395cc3..790dab1b5d 100644 --- a/packages/textproc/libxml2/meta +++ b/packages/textproc/libxml2/meta @@ -25,8 +25,8 @@ PKG_ARCH="any" PKG_LICENSE="MIT" PKG_SITE="http://xmlsoft.org" PKG_URL="ftp://xmlsoft.org/libxml2/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS="libiconv" -PKG_BUILD_DEPENDS="toolchain libiconv" +PKG_DEPENDS="$ICONV" +PKG_BUILD_DEPENDS="toolchain $ICONV" PKG_PRIORITY="optional" PKG_SECTION="textproc" PKG_SHORTDESC="libxml: XML parser library for Gnome"