diff options
| author | Volker Grabsch <vog@notjusthosting.com> | 2010-05-19 20:35:49 (GMT) |
|---|---|---|
| committer | Volker Grabsch <vog@notjusthosting.com> | 2010-05-19 20:35:49 (GMT) |
| commit | bc2cfdc051a64fd4212344e17563844b509ce9d1 (patch) | |
| tree | 9a50913de710a212fd3ed617ea2c0b30b2ca6b43 /src | |
| parent | a63b9fe4ddaecd50fb06587362258e63af87a8b9 (diff) | |
| download | mxe-bc2cfdc051a64fd4212344e17563844b509ce9d1.zip mxe-bc2cfdc051a64fd4212344e17563844b509ce9d1.tar.gz mxe-bc2cfdc051a64fd4212344e17563844b509ce9d1.tar.bz2 | |
replaced $(SED) action with a clean patch in package glib
Diffstat (limited to 'src')
| -rw-r--r-- | src/glib-4-fix-dependency-libs.patch | 28 | ||||
| -rw-r--r-- | src/glib.mk | 1 |
2 files changed, 28 insertions, 1 deletions
diff --git a/src/glib-4-fix-dependency-libs.patch b/src/glib-4-fix-dependency-libs.patch new file mode 100644 index 0000000..2b7ce4d --- /dev/null +++ b/src/glib-4-fix-dependency-libs.patch @@ -0,0 +1,28 @@ +This file is part of mingw-cross-env. +See doc/index.html for further information. + +This patch has been taken from: +https://bugzilla.gnome.org/show_bug.cgi?id=619126 + +diff -r 1168b72613ae configure.in +--- a/configure.in Wed May 19 20:15:53 2010 +0200 ++++ b/configure.in Wed May 19 21:11:17 2010 +0200 +@@ -2711,7 +2711,7 @@ + G_LIBS_EXTRA="-luser32 -lkernel32" + ;; + *-*-mingw*) +- G_LIBS_EXTRA="-lws2_32 -lole32" ++ G_LIBS_EXTRA="-lws2_32 -lole32 -lshlwapi" + ;; + *) + G_LIBS_EXTRA="" +diff -r 1168b72613ae glib-2.0.pc.in +--- a/glib-2.0.pc.in Wed May 19 20:15:53 2010 +0200 ++++ b/glib-2.0.pc.in Wed May 19 20:17:05 2010 +0200 +@@ -11,5 +11,5 @@ + Description: C Utility Library + Version: @VERSION@ + Libs: -L${libdir} -lglib-2.0 @INTLLIBS@ +-Libs.private: @ICONV_LIBS@ ++Libs.private: @G_THREAD_LIBS@ @G_LIBS_EXTRA@ @PCRE_LIBS@ @INTLLIBS@ @ICONV_LIBS@ + Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include @GLIB_EXTRA_CFLAGS@ diff --git a/src/glib.mk b/src/glib.mk index 4df905b..b487ec9 100644 --- a/src/glib.mk +++ b/src/glib.mk @@ -53,7 +53,6 @@ define $(PKG)_BUILD $(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' # wine confuses the cross-compiling detection, so set it explicitly $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' cd '$(1)' && ./configure \ |