diff options
| author | Volker Grabsch <vog@notjusthosting.com> | 2010-04-26 13:07:14 (GMT) |
|---|---|---|
| committer | Volker Grabsch <vog@notjusthosting.com> | 2010-04-26 13:07:14 (GMT) |
| commit | ed842428709751b0f59eab58a268e01b2e5306c0 (patch) | |
| tree | be6e76f0851518e21480f8dcb15a4ffd8a15e054 /src/glib.mk | |
| parent | 3d44e5ce31abcc2395efd110f352f83d0e664378 (diff) | |
| download | mxe-ed842428709751b0f59eab58a268e01b2e5306c0.zip mxe-ed842428709751b0f59eab58a268e01b2e5306c0.tar.gz mxe-ed842428709751b0f59eab58a268e01b2e5306c0.tar.bz2 | |
revert upgrade of package glib
Diffstat (limited to 'src/glib.mk')
| -rw-r--r-- | src/glib.mk | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/src/glib.mk b/src/glib.mk index c63b5f3..a2eb937 100644 --- a/src/glib.mk +++ b/src/glib.mk @@ -4,8 +4,8 @@ # GLib PKG := glib $(PKG)_IGNORE := -$(PKG)_VERSION := 2.25.3 -$(PKG)_CHECKSUM := 5a8cf17c44decb27de3fbc202be05c89d55f647d +$(PKG)_VERSION := 2.24.0 +$(PKG)_CHECKSUM := 32714e64fff52d18db5f077732910215790e0c5b $(PKG)_SUBDIR := glib-$($(PKG)_VERSION) $(PKG)_FILE := glib-$($(PKG)_VERSION).tar.bz2 $(PKG)_WEBSITE := http://www.gtk.org/ @@ -38,7 +38,7 @@ define $(PKG)_BUILD --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ --enable-regex \ - --enable-threads \ + --disable-threads \ --disable-selinux \ --disable-fam \ --disable-xattr \ @@ -46,14 +46,9 @@ define $(PKG)_BUILD CPPFLAGS='-I$(1).native/$(libiconv_SUBDIR)/include' \ LDFLAGS='-L$(1).native/$(libiconv_SUBDIR)/lib/.libs' $(SED) -i 's,#define G_ATOMIC.*,,' '$(1).native/config.h' - $(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/gmodule' -j '$(JOBS)' - $(MAKE) -C '$(1).native/gio/xdgmime' -j '$(JOBS)' - $(MAKE) -C '$(1).native/gio/inotify' -j '$(JOBS)' - $(MAKE) -C '$(1).native/gio/libasyncns' -j '$(JOBS)' - $(MAKE) -C '$(1).native/gio' -j '$(JOBS)' + $(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 # cross build $(SED) -i 's,^\(Libs:.*\),\1 @PCRE_LIBS@ @G_THREAD_LIBS@ @G_LIBS_EXTRA@ -lshlwapi,' '$(1)/glib-2.0.pc.in' @@ -69,8 +64,6 @@ 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' - ln -s '$(1).native/gio/gschema-compile' '$(1)/gio/gschema-compile' $(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= |