From e9bc71b5a970faf9c362c1a7f9472206e1a3d9d8 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Mon, 16 Jan 2012 12:32:58 +0100
Subject: [PATCH] xerces-c: make build with libiconv optional

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/textproc/xerces-c/build | 4 +++-
 packages/textproc/xerces-c/meta  | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/textproc/xerces-c/build b/packages/textproc/xerces-c/build
index 21970f407e..1232e51797 100755
--- a/packages/textproc/xerces-c/build
+++ b/packages/textproc/xerces-c/build
@@ -25,7 +25,9 @@
 # xerces_c fails to build with LTO support
   strip_lto
 
-export LDFLAGS="$LDFLAGS -liconv"
+if [ "$ICONV" = "libiconv" ]; then
+  export LDFLAGS="$LDFLAGS -liconv"
+fi
 
 cd $PKG_BUILD
 ./configure --host=$TARGET_NAME \
diff --git a/packages/textproc/xerces-c/meta b/packages/textproc/xerces-c/meta
index ddc3f4f3f9..6adbf7e248 100644
--- a/packages/textproc/xerces-c/meta
+++ b/packages/textproc/xerces-c/meta
@@ -25,8 +25,8 @@ PKG_ARCH="any"
 PKG_LICENSE="APL"
 PKG_SITE="http://xml.apache.org/xerces-c/"
 PKG_URL="http://mirror.switch.ch/mirror/apache/dist/xerces/c/3/sources/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS="libiconv curl"
-PKG_BUILD_DEPENDS="toolchain libiconv curl"
+PKG_DEPENDS="$ICONV curl"
+PKG_BUILD_DEPENDS="toolchain $ICONV curl"
 PKG_PRIORITY="optional"
 PKG_SECTION="textproc"
 PKG_SHORTDESC="xerces-c: A C++ XML parser"