Mercurial > mxe-octave

changeset 271:2801bf7db05e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
switch glib to win32 threading
author Volker Grabsch <vog@notjusthosting.com>
date Thu, 05 Mar 2009 16:55:13 +0100
parents 92713cb9be20
children a91ec84e4206
files src/glib.mk
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/glib.mk	Thu Mar 05 16:54:57 2009 +0100
+++ b/src/glib.mk	Thu Mar 05 16:55:13 2009 +0100
@@ -6,7 +6,7 @@
 $(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 @@
     $(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