summaryrefslogtreecommitdiff
path: root/package/glib
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@uclibc-ng.org>2018-01-17 19:25:18 +0000
committerWaldemar Brodkorb <wbx@uclibc-ng.org>2018-01-17 19:25:18 +0000
commit2d61704bccd4f9e43428f4b9e98db007388c2f69 (patch)
tree4ddc79e1dc559fe62083794bfdd5de2e741f521c /package/glib
parent76ee4d0f6d91a32868544006d77ae263637e825e (diff)
fix some bugs, while trying to use new gentoo laptop
Diffstat (limited to 'package/glib')
-rw-r--r--package/glib/Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/package/glib/Makefile b/package/glib/Makefile
index 7f85fe7c9..9e841acd6 100644
--- a/package/glib/Makefile
+++ b/package/glib/Makefile
@@ -12,7 +12,7 @@ PKG_DESCR:= low-level core library that forms the basis of gtk+
PKG_SECTION:= libs/misc
PKG_DEPENDS:= libpcre zlib
PKG_BUILDDEP:= glib-host libffi zlib libelf dbus pcre
-HOST_BUILDDEP:= libffi-host python2-host gettext-host util-linux-host
+HOST_BUILDDEP:= libiconv-host libffi-host python2-host gettext-host util-linux-host
PKG_NEEDS:= threads intl iconv
PKG_URL:= http://www.gtk.org/
PKG_SITES:= http://ftp.gnome.org/pub/GNOME/sources/glib/$(PKG_EXTRAVER)/
@@ -26,6 +26,8 @@ $(eval $(call PKG_template,GLIB,glib,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS
ifeq ($(ADK_PACKAGE_LIBICONV),y)
CONFIGURE_ARGS+= --with-libiconv=yes
+else
+CONFIGURE_ARGS+= --with-libiconv=no
endif
CONFIGURE_ARGS+= --disable-mem-pools \
--disable-rebuilds \
@@ -45,13 +47,11 @@ HOST_STYLE:= auto
ifneq ($(OS_FOR_BUILD),CYGWIN)
HOST_CFLAGS+= -fPIC
endif
-ifneq ($(OS_FOR_BUILD),Darwin)
-HOST_CONFIGURE_ARGS+= --with-libiconv=no
-endif
HOST_CONFIGURE_ARGS+= --disable-fam \
--disable-dtrace \
--enable-static \
--with-pcre=bundled \
+ --with-libiconv=yes \
--disable-shared \
--disable-compile-warnings