diff -r 1704495171f3 src/glib.mk --- a/src/glib.mk Fri May 14 21:47:30 2010 +0200 +++ b/src/glib.mk Sun May 16 00:03:26 2010 +1000 @@ -4,8 +4,8 @@ # GLib PKG := glib $(PKG)_IGNORE := -$(PKG)_VERSION := 2.25.3 -$(PKG)_CHECKSUM := 5a8cf17c44decb27de3fbc202be05c89d55f647d +$(PKG)_VERSION := 2.25.5 +$(PKG)_CHECKSUM := aa9cd7e82b79f1aa2337ae2b1461f8d1ddc55806 $(PKG)_SUBDIR := glib-$($(PKG)_VERSION) $(PKG)_FILE := glib-$($(PKG)_VERSION).tar.bz2 $(PKG)_WEBSITE := http://www.gtk.org/ @@ -49,7 +49,6 @@ $(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' @@ -65,11 +64,9 @@ 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= $(MAKE) -C '$(1)/gobject' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= - $(MAKE) -C '$(1)/gio' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= MISC_STUFF= $(MAKE) -C '$(1)' -j '$(JOBS)' install-pkgconfigDATA install-configexecincludeDATA endef