Mercurial > mxe-octave
changeset 935:9993be51f18d
disable the use of the buggy Pthreads-w32 library in packages freetds, guile, libmikmod, libshout, libxml2, sqlite, tiff, vorbis and xerces
| author | Volker Grabsch <vog@notjusthosting.com> |
|---|---|
| date | Sun, 02 May 2010 17:58:37 +0200 |
| parents | 60c8d4c40785 |
| children | c77bf2dc2445 |
| files | src/freetds.mk src/guile.mk src/libmikmod.mk src/libshout.mk src/libxml2.mk src/sqlite.mk src/tiff.mk src/vorbis.mk src/xerces.mk |
| diffstat | 9 files changed, 8 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/freetds.mk Sun May 02 17:29:57 2010 +0200 +++ b/src/freetds.mk Sun May 02 17:58:37 2010 +0200 @@ -37,6 +37,7 @@ --enable-static \ --enable-libiconv \ --enable-msdblib \ + --disable-threadsafe \ --with-tdsver=8.0 $(MAKE) -C '$(1)' -j '$(JOBS)' install endef
--- a/src/guile.mk Sun May 02 17:29:57 2010 +0200 +++ b/src/guile.mk Sun May 02 17:58:37 2010 +0200 @@ -24,7 +24,7 @@ --host='$(TARGET)' \ --prefix='$(PREFIX)/$(TARGET)' \ --disable-shared \ - --with-threads \ + --without-threads \ LIBS='-lunistring -lintl -liconv' $(MAKE) -C '$(1)' -j '$(JOBS)' schemelib_DATA= $(MAKE) -C '$(1)' -j 1 install schemelib_DATA=
--- a/src/libmikmod.mk Sun May 02 17:29:57 2010 +0200 +++ b/src/libmikmod.mk Sun May 02 17:58:37 2010 +0200 @@ -26,8 +26,6 @@ NM='$(TARGET)-nm' \ RANLIB='$(TARGET)-ranlib' \ STRIP='$(TARGET)-strip' \ - LIBS='-lws2_32' \ - LIBRARY_LIB='-lws2_32' \ ./configure \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \
--- a/src/libshout.mk Sun May 02 17:29:57 2010 +0200 +++ b/src/libshout.mk Sun May 02 17:58:37 2010 +0200 @@ -24,6 +24,7 @@ --prefix='$(PREFIX)/$(TARGET)' \ --disable-shared \ --disable-debug \ + --disable-thread \ --infodir='$(1)/sink' \ --mandir='$(1)/sink' $(MAKE) -C '$(1)' -j '$(JOBS)' install
--- a/src/libxml2.mk Sun May 02 17:29:57 2010 +0200 +++ b/src/libxml2.mk Sun May 02 17:58:37 2010 +0200 @@ -26,7 +26,8 @@ --disable-shared \ --without-debug \ --prefix='$(PREFIX)/$(TARGET)' \ - --without-python + --without-python \ + --without-threads $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= endef
--- a/src/sqlite.mk Sun May 02 17:29:57 2010 +0200 +++ b/src/sqlite.mk Sun May 02 17:58:37 2010 +0200 @@ -25,6 +25,6 @@ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ --disable-readline \ - LIBS='-lws2_32' + --disable-threadsafe $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= endef
--- a/src/tiff.mk Sun May 02 17:29:57 2010 +0200 +++ b/src/tiff.mk Sun May 02 17:58:37 2010 +0200 @@ -24,7 +24,6 @@ --host='$(TARGET)' \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ - PTHREAD_LIBS='-lpthread -lws2_32' \ --without-x $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= endef
--- a/src/vorbis.mk Sun May 02 17:29:57 2010 +0200 +++ b/src/vorbis.mk Sun May 02 17:58:37 2010 +0200 @@ -23,7 +23,6 @@ --host='$(TARGET)' \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ - PKG_CONFIG='$(TARGET)-pkg-config' \ - LIBS='-lws2_32' + PKG_CONFIG='$(TARGET)-pkg-config' $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= endef
--- a/src/xerces.mk Sun May 02 17:29:57 2010 +0200 +++ b/src/xerces.mk Sun May 02 17:58:37 2010 +0200 @@ -27,7 +27,7 @@ --prefix='$(PREFIX)/$(TARGET)' \ --enable-libtool-lock \ --disable-pretty-make \ - --enable-threads \ + --disable-threads \ --enable-network \ --enable-netaccessor-curl \ --disable-netaccessor-socket \