From 2c43c55658ff17e494a74d447d51e29138caf7ae Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Mon, 16 Jan 2012 12:35:25 +0100
Subject: [PATCH] glib: make build with libiconv optional

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/devel/glib/build | 7 +++++--
 packages/devel/glib/meta  | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/packages/devel/glib/build b/packages/devel/glib/build
index 3f407e3bf9..19b79967d1 100755
--- a/packages/devel/glib/build
+++ b/packages/devel/glib/build
@@ -22,6 +22,10 @@
 
 . config/options $1
 
+if [ "$ICONV" = "libiconv" ]; then
+  CONFIG_GLIB="--with-libiconv"
+fi
+
 # Fails to compile with GCC link time optimization, outputing the error:
 # "mem-overflow.c:137:1: sorry, unimplemented: gimple bytecode streams do not support the optimization attribute".
   strip_lto
@@ -60,10 +64,9 @@ glib_cv_va_val_copy='no' \
              --with-gnu-ld \
              --with-threads=posix \
              --with-pcre=system \
-             --with-libiconv \
+             $CONFIG_GLIB \
 
 make
-
 $MAKEINSTALL
 
 mkdir -p $SYSROOT_PREFIX/usr/lib/pkgconfig
diff --git a/packages/devel/glib/meta b/packages/devel/glib/meta
index 158e6eb315..cd5cf2c532 100644
--- a/packages/devel/glib/meta
+++ b/packages/devel/glib/meta
@@ -25,8 +25,8 @@ PKG_ARCH="any"
 PKG_LICENSE="LGPL"
 PKG_SITE="http://www.gtk.org/"
 PKG_URL="http://ftp.gnome.org/pub/gnome/sources/glib/2.31/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS="zlib libiconv libffi pcre"
-PKG_BUILD_DEPENDS="toolchain zlib libiconv libffi pcre glib-host gtk-doc Python-host"
+PKG_DEPENDS="zlib $ICONV libffi pcre"
+PKG_BUILD_DEPENDS="toolchain zlib $ICONV libffi pcre glib-host gtk-doc Python-host"
 PKG_PRIORITY="optional"
 PKG_SECTION="devel"
 PKG_SHORTDESC="glib: C support library"