From fbe47cba997e4f2f2dbaa6af0583dbec2e5d130c Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 2 Nov 2013 12:03:09 +0100
Subject: remove dependencies to libiconv,pkg-config and file. use pkgconf and
libiconv-tiny instead. fixes glib compile on systems without libiconv/ native
iconv implementation
---
package/glib/Makefile | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
(limited to 'package/glib')
diff --git a/package/glib/Makefile b/package/glib/Makefile
index 23d0230e5..c499a747b 100644
--- a/package/glib/Makefile
+++ b/package/glib/Makefile
@@ -5,13 +5,14 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= glib
PKG_VERSION:= 2.28.1
+PKG_RELEASE:= 5
PKG_EXTRAVER:= 2.28
-PKG_RELEASE:= 4
PKG_MD5SUM:= 9f6e85e1e38490c3956f4415bcd33e6e
PKG_DESCR:= low-level core library that forms the basis of GTK+
PKG_SECTION:= libs
-PKG_DEPENDS:= libiconv libpthread
-PKG_BUILDDEP:= gettext-tiny-host gettext-tiny libiconv dbus glib-host
+PKG_DEPENDS:= libpthread
+PKG_BUILDDEP:= gettext-tiny-host gettext-tiny libiconv-tiny-host
+PKG_BUILDDEP:= libiconv-tiny glib-host zlib
PKG_URL:= http://www.gtk.org/
PKG_SITES:= http://ftp.gnome.org/pub/gnome/sources/glib/${PKG_EXTRAVER}/
PKG_NOPARALLEL:= 1
@@ -28,11 +29,9 @@ $(eval $(call HOST_template,GLIB,glib,${PKG_VERSION}-${PKG_RELEASE}))
$(eval $(call PKG_template,GLIB,glib,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
-CONFIGURE_ARGS+= --enable-debug=no \
- --disable-mem-pools \
+CONFIGURE_ARGS+= --disable-mem-pools \
--disable-rebuilds \
--disable-fam \
- --with-libiconv=gnu \
--with-threads=posix
CONFIGURE_ENV+= glib_cv_long_long_format=ll \
glib_cv_stack_grows=no \
@@ -42,8 +41,6 @@ CONFIGURE_ENV+= glib_cv_long_long_format=ll \
ac_cv_func_posix_getgrgid_r=yes
HOST_CONFIGURE_ARGS+= --prefix=$(HOST_WRKINST)/usr \
- --with-libiconv=gnu \
- --enable-debug=no \
--disable-fam
glib-hostinstall:
--
cgit v1.2.3