Mercurial > mxe-octave

changeset 914:ea9734b40ea5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Mark Brand <mabrand@mabrand.nl>
date Tue, 27 Apr 2010 10:50:05 +0200
parents 11da26470d14
children 43389b74773e
files src/glib.mk
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/glib.mk	Tue Apr 27 11:46:07 2010 +0200
+++ b/src/glib.mk	Tue Apr 27 10:50:05 2010 +0200
@@ -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 @@
     $(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 @@
         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=