diff options
| -rw-r--r-- | src/glib-win32.patch | 16 | ||||
| -rw-r--r-- | src/glib.mk | 5 |
2 files changed, 19 insertions, 2 deletions
diff --git a/src/glib-win32.patch b/src/glib-win32.patch index f8eee61..5f9141a 100644 --- a/src/glib-win32.patch +++ b/src/glib-win32.patch @@ -25,3 +25,19 @@ diff -ru glib-2.23.2.orig/m4macros/glib-gettext.m4 glib-2.23.2/m4macros/glib-get fi fi ]) +diff -ru glib-2.23.2.orig/glib-2.0.pc.in glib-2.23.2/glib-2.0.pc.in +--- glib-2.23.2.orig/glib-2.0.pc.in 2009-04-01 01:04:20.000000000 +0200 ++++ glib-2.23.2/glib-2.0.pc.in 2010-02-07 23:58:08.000000000 +0100 +@@ -3,9 +3,9 @@ + libdir=@libdir@ + includedir=@includedir@ + +-glib_genmarshal=glib-genmarshal +-gobject_query=gobject-query +-glib_mkenums=glib-mkenums ++glib_genmarshal=@bindir@/glib-genmarshal ++gobject_query=@bindir@/gobject-query ++glib_mkenums=@bindir@/glib-mkenums + + Name: GLib + Description: C Utility Library diff --git a/src/glib.mk b/src/glib.mk index 033e0f4..eaa52fe 100644 --- a/src/glib.mk +++ b/src/glib.mk @@ -30,7 +30,7 @@ define $(PKG)_BUILD $(SED) 's,found_zlib=no,found_zlib=yes,' -i '$(1).native/configure' cd '$(1).native' && ./configure \ --disable-shared \ - --prefix='$(PREFIX)' \ + --prefix='$(PREFIX)/$(TARGET)' \ --enable-regex \ --disable-threads \ --disable-selinux \ @@ -57,7 +57,8 @@ define $(PKG)_BUILD --with-pcre=system \ --with-libiconv=gnu \ CXX='$(TARGET)-c++' \ - PKG_CONFIG='$(PREFIX)/bin/$(TARGET)-pkg-config' + PKG_CONFIG='$(PREFIX)/bin/$(TARGET)-pkg-config' \ + GLIB_GENMARSHAL='$(PREFIX)/$(TARGET)/bin/glib-genmarshal' $(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= |