summaryrefslogtreecommitdiffstats
path: root/src/glib.mk
diff options
context:
space:
mode:
authorMark Brand <mabrand@mabrand.nl>2010-04-27 08:50:05 (GMT)
committerMark Brand <mabrand@mabrand.nl>2010-04-27 08:50:05 (GMT)
commit73e43052385697d19f862801743b0a6bebfea747 (patch)
treea0810767f7aae3d70e558adecdfdb2fdf19ca06e /src/glib.mk
parentb0dd877ec8efeefe163bda16f88b6ef7a0b11062 (diff)
downloadmxe-73e43052385697d19f862801743b0a6bebfea747.zip
mxe-73e43052385697d19f862801743b0a6bebfea747.tar.gz
mxe-73e43052385697d19f862801743b0a6bebfea747.tar.bz2
upgrade package glib
This is the 2nd attempt to build glib 2.25.3. This time we take a more minimalistic approach to the native gio subproject, building only the utility glib-compile-schemas which is needed to crossbuild.
Diffstat (limited to 'src/glib.mk')
-rw-r--r--src/glib.mk6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/glib.mk b/src/glib.mk
index d7252ab..697e930 100644
--- a/src/glib.mk
+++ b/src/glib.mk
@@ -4,8 +4,8 @@
# GLib
PKG := glib
$(PKG)_IGNORE :=
-$(PKG)_VERSION := 2.24.0
-$(PKG)_CHECKSUM := 32714e64fff52d18db5f077732910215790e0c5b
+$(PKG)_VERSION := 2.25.3
+$(PKG)_CHECKSUM := 5a8cf17c44decb27de3fbc202be05c89d55f647d
$(PKG)_SUBDIR := glib-$($(PKG)_VERSION)
$(PKG)_FILE := glib-$($(PKG)_VERSION).tar.bz2
$(PKG)_WEBSITE := http://www.gtk.org/
@@ -48,6 +48,7 @@ define $(PKG)_BUILD
$(MAKE) -C '$(1).native/glib' -j '$(JOBS)'
$(MAKE) -C '$(1).native/gthread' -j '$(JOBS)'
$(MAKE) -C '$(1).native/gobject' -j '$(JOBS)' lib_LTLIBRARIES= install-exec
+ $(MAKE) -C '$(1).native/gio' -j '$(JOBS)' glib-compile-schemas
# cross build
$(SED) -i 's,^\(Libs:.*\),\1 @PCRE_LIBS@ @G_THREAD_LIBS@ @G_LIBS_EXTRA@ -lshlwapi,' '$(1)/glib-2.0.pc.in'
@@ -63,6 +64,7 @@ define $(PKG)_BUILD
CXX='$(TARGET)-c++' \
PKG_CONFIG='$(PREFIX)/bin/$(TARGET)-pkg-config' \
GLIB_GENMARSHAL='$(PREFIX)/$(TARGET)/bin/glib-genmarshal'
+ ln -s '$(1).native/gio/glib-compile-schemas' '$(1)/gio/glib-compile-schemas'
$(MAKE) -C '$(1)/glib' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
$(MAKE) -C '$(1)/gmodule' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
$(MAKE) -C '$(1)/gthread' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=