glib: make build with libiconv optional

Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2012-01-16 12:35:25 +01:00
parent 8d02c6c1d3
commit 2c43c55658
2 changed files with 7 additions and 4 deletions

View File

@ -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

View File

@ -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"