summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <mail@waldemar-brodkorb.de>2013-11-01 15:25:27 +0100
committerWaldemar Brodkorb <mail@waldemar-brodkorb.de>2013-11-01 15:25:27 +0100
commitcfd377d779327c4aaed5b0b7317db794e74ade74 (patch)
tree676feac7f10bc8cf1ffe0038a70e60dae13e2dcb
parentd4b446db89ba29b844b1f05dc112bc8d5c573f4b (diff)
fix macos x host compile
-rw-r--r--package/glib/Makefile5
-rw-r--r--package/glib/patches/patch-ltmain_sh6
2 files changed, 6 insertions, 5 deletions
diff --git a/package/glib/Makefile b/package/glib/Makefile
index d5a71f49f..23d0230e5 100644
--- a/package/glib/Makefile
+++ b/package/glib/Makefile
@@ -6,12 +6,12 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= glib
PKG_VERSION:= 2.28.1
PKG_EXTRAVER:= 2.28
-PKG_RELEASE:= 3
+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 libiconv dbus glib-host
+PKG_BUILDDEP:= gettext-tiny-host gettext-tiny libiconv dbus glib-host
PKG_URL:= http://www.gtk.org/
PKG_SITES:= http://ftp.gnome.org/pub/gnome/sources/glib/${PKG_EXTRAVER}/
PKG_NOPARALLEL:= 1
@@ -42,6 +42,7 @@ 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
diff --git a/package/glib/patches/patch-ltmain_sh b/package/glib/patches/patch-ltmain_sh
index 16078c020..b69b349d4 100644
--- a/package/glib/patches/patch-ltmain_sh
+++ b/package/glib/patches/patch-ltmain_sh
@@ -1,6 +1,6 @@
---- glib-2.33.14.orig/ltmain.sh 2012-09-17 23:25:27.000000000 +0200
-+++ glib-2.33.14/ltmain.sh 2012-09-23 11:07:23.000000000 +0200
-@@ -5853,7 +5853,7 @@ func_mode_link ()
+--- glib-2.28.1.orig/ltmain.sh 2011-02-08 13:25:07.000000000 +0100
++++ glib-2.28.1/ltmain.sh 2013-10-31 19:37:51.000000000 +0100
+@@ -5840,7 +5840,7 @@ func_mode_link ()
# -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \