Mercurial > mxe-octave
changeset 909:fbb1667f8e3a
revert upgrade of package glib
author | Volker Grabsch <vog@notjusthosting.com> |
---|---|
date | Mon, 26 Apr 2010 15:07:14 +0200 |
parents | 070eb078f1c2 |
children | f0e89176cc72 |
files | src/glib.mk |
diffstat | 1 files changed, 6 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/src/glib.mk Mon Apr 26 00:13:02 2010 +0200 +++ b/src/glib.mk Mon Apr 26 15:07:14 2010 +0200 @@ -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 @@ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ --enable-regex \ - --enable-threads \ + --disable-threads \ --disable-selinux \ --disable-fam \ --disable-xattr \ @@ -46,14 +46,9 @@ 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 @@ 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=