summaryrefslogtreecommitdiffstats
path: root/src/glib.mk
diff options
context:
space:
mode:
authorVolker Grabsch <vog@notjusthosting.com>2009-03-05 15:55:13 (GMT)
committerVolker Grabsch <vog@notjusthosting.com>2009-03-05 15:55:13 (GMT)
commit5a60c7624f1ba5125096dabe507835a5914643d5 (patch)
treea1d179bc396d4a45cf172e7b26d8c7226960799e /src/glib.mk
parent7b2f8beb9d2663e6e04e4d11b8b899e74943c4c8 (diff)
downloadmxe-5a60c7624f1ba5125096dabe507835a5914643d5.zip
mxe-5a60c7624f1ba5125096dabe507835a5914643d5.tar.gz
mxe-5a60c7624f1ba5125096dabe507835a5914643d5.tar.bz2
switch glib to win32 threading
Diffstat (limited to 'src/glib.mk')
-rw-r--r--src/glib.mk8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/glib.mk b/src/glib.mk
index bd1ebcd..315c027 100644
--- a/src/glib.mk
+++ b/src/glib.mk
@@ -6,7 +6,7 @@ $(PKG)_SUBDIR := glib-$($(PKG)_VERSION)
$(PKG)_FILE := glib-$($(PKG)_VERSION).tar.bz2
$(PKG)_WEBSITE := http://www.gtk.org/
$(PKG)_URL := http://ftp.gnome.org/pub/gnome/sources/glib/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)
-$(PKG)_DEPS := gcc gettext pcre libiconv pthreads
+$(PKG)_DEPS := gcc gettext pcre libiconv
define $(PKG)_UPDATE
wget -q -O- 'http://www.gtk.org/download-windows.html' | \
@@ -29,15 +29,15 @@ define $(PKG)_BUILD
$(SED) 's,#define G_ATOMIC.*,,' -i '$(1)/$(glib_SUBDIR)/config.h'
$(MAKE) -C '$(1)/$(glib_SUBDIR)/glib' -j '$(JOBS)'
$(MAKE) -C '$(1)/$(glib_SUBDIR)/gobject' -j '$(JOBS)' lib_LTLIBRARIES= install-exec
+
# cross build
$(SED) 's,^\(Libs:.*\),\1 @PCRE_LIBS@ @G_THREAD_LIBS@ @G_LIBS_EXTRA@ -lshlwapi,' -i '$(1)/glib-2.0.pc.in'
cd '$(1)' && ./configure \
--host='$(TARGET)' \
--disable-shared \
--prefix='$(PREFIX)/$(TARGET)' \
- --with-threads=posix \
+ --with-threads=win32 \
--with-pcre=system \
- PKG_CONFIG='$(PREFIX)/bin/$(TARGET)-pkg-config' \
- LIBS="-lws2_32"
+ PKG_CONFIG='$(PREFIX)/bin/$(TARGET)-pkg-config'
$(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
endef