diff options
| -rw-r--r-- | berkeleydb/makefile.mk | 8 | ||||
| -rw-r--r-- | cairo/cairo/makefile.mk | 4 | ||||
| -rw-r--r-- | cairo/pixman/makefile.mk | 2 | ||||
| -rw-r--r-- | curl/makefile.mk | 6 | ||||
| -rw-r--r-- | graphite/makefile.mk | 4 | ||||
| -rw-r--r-- | hunspell/makefile.mk | 2 | ||||
| -rw-r--r-- | icu/makefile.mk | 1 | ||||
| -rw-r--r-- | libxml2/makefile.mk | 6 | ||||
| -rw-r--r-- | libxslt/makefile.mk | 6 | ||||
| -rw-r--r-- | python/makefile.mk | 1 |
10 files changed, 20 insertions, 20 deletions
diff --git a/berkeleydb/makefile.mk b/berkeleydb/makefile.mk index 963c61a3bbde..325e8700e7a8 100644 --- a/berkeleydb/makefile.mk +++ b/berkeleydb/makefile.mk @@ -120,9 +120,9 @@ OUT2INC= \ CONFIGURE_DIR=out #relative to CONFIGURE_DIR # TODO needs clean up -CFLAGS+=-nostdinc -D_MT -db_CC=$(CC) -db_CXX=$(CXX) +CFLAGS+=-nostdinc +db_CC=$(CC) -mthreads +db_CXX=$(CXX) -mthreads .IF "$(MINGW_SHARED_GCCLIB)"=="YES" db_CC+=-shared-libgcc db_CXX+=-shared-libgcc @@ -132,7 +132,7 @@ db_LDFLAGS=-no-undefined -L$(SOLARVER)/$(INPATH)/lib -L$(SOLARVER)/$(INPATH)/bin db_LDFLAGS+=-L$(COMPATH)/lib/mingw -L$(COMPATH)/lib/w32api .ENDIF db_LDFLAGS+=-L$(COMPATH)/lib -L$(MINGW_CLIB_DIR) -db_LIBS=-lmingwthrd +db_LIBS= .IF "$(MINGW_SHARED_GXXLIB)"=="YES" CFLAGS+=-D_GLIBCXX_DLL db_LIBS+=-lstdc++_s diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk index e0b12cc9f551..a29012892576 100644 --- a/cairo/cairo/makefile.mk +++ b/cairo/cairo/makefile.mk @@ -70,11 +70,9 @@ cairo_CPPFLAGS+=$(INCLUDE) .IF "$(OS)"=="WNT" # --------- Windows ------------------------------------------------- .IF "$(COM)"=="GCC" -cairo_CFLAGS+=-D_MT cairo_LDFLAGS+=-no-undefined -L$(ILIB:s/;/ -L/) cairo_CPPFLAGS+=-nostdinc -cairo_CC=$(CC) -cairo_LIBS+=-lmingwthrd +cairo_CC=$(CC) -mthreads .IF "$(MINGW_SHARED_GCCLIB)"=="YES" cairo_CC+=-shared-libgcc diff --git a/cairo/pixman/makefile.mk b/cairo/pixman/makefile.mk index 20773c7597f8..f3c1c091639c 100644 --- a/cairo/pixman/makefile.mk +++ b/cairo/pixman/makefile.mk @@ -62,7 +62,7 @@ PATCH_FILES=..$/$(TARFILE_NAME).patch .IF "$(COM)"=="GCC" CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure -CONFIGURE_FLAGS=--enable-static=yes --enable-shared=no --build=i586-pc-mingw32 --host=i586-pc-mingw32 CFLAGS="$(pixman_CFLAGS) -D_MT" LDFLAGS="$(pixman_LDFLAGS) -no-undefined -L$(ILIB:s/;/ -L/)" LIBS="-lmingwthrd" OBJDUMP="$(WRAPCMD) objdump" +CONFIGURE_FLAGS=--enable-static=yes --enable-shared=no --build=i586-pc-mingw32 --host=i586-pc-mingw32 CFLAGS="$(pixman_CFLAGS) -mthreads" LDFLAGS="$(pixman_LDFLAGS) -no-undefined -L$(ILIB:s/;/ -L/)" OBJDUMP="$(WRAPCMD) objdump" BUILD_ACTION=$(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) diff --git a/curl/makefile.mk b/curl/makefile.mk index 1fab0c301bff..adab75f41d49 100644 --- a/curl/makefile.mk +++ b/curl/makefile.mk @@ -89,18 +89,18 @@ OUT2LIB=$(BUILD_DIR)$/.libs$/libcurl$(DLLPOST).4 .IF "$(GUI)"=="WNT" .IF "$(COM)"=="GCC" -curl_CC=$(CC) +curl_CC=$(CC) -mthreads .IF "$(MINGW_SHARED_GCCLIB)"=="YES" curl_CC+=-shared-libgcc .ENDIF -curl_LIBS=-lws2_32 -lwinmm -lmingwthrd +curl_LIBS=-lws2_32 -lwinmm .IF "$(MINGW_SHARED_GXXLIB)"=="YES" curl_LIBS+=-lstdc++_s .ENDIF CONFIGURE_DIR=.$/ #relative to CONFIGURE_DIR CONFIGURE_ACTION=.$/configure -CONFIGURE_FLAGS= --without-ssl --enable-ftp --enable-ipv6 --disable-http --disable-gopher --disable-file --disable-ldap --disable-telnet --disable-dict --build=i586-pc-mingw32 --host=i586-pc-mingw32 CC="$(curl_CC)" CPPFLAGS="$(INCLUDE)" OBJDUMP="objdump" CFLAGS=-D_MT LDFLAGS="-L$(ILIB:s/;/ -L/)" LIBS="$(curl_LIBS)" +CONFIGURE_FLAGS= --without-ssl --enable-ftp --enable-ipv6 --disable-http --disable-gopher --disable-file --disable-ldap --disable-telnet --disable-dict --build=i586-pc-mingw32 --host=i586-pc-mingw32 CC="$(curl_CC)" CPPFLAGS="$(INCLUDE)" OBJDUMP="objdump" LDFLAGS="-L$(ILIB:s/;/ -L/)" LIBS="$(curl_LIBS)" BUILD_DIR=$(CONFIGURE_DIR)$/lib BUILD_ACTION=make OUT2BIN=$(BUILD_DIR)$/.libs$/libcurl*.dll diff --git a/graphite/makefile.mk b/graphite/makefile.mk index 66100242bfe1..a2da080a0c76 100644 --- a/graphite/makefile.mk +++ b/graphite/makefile.mk @@ -101,7 +101,7 @@ GR_LIB_PATH= .IF "$(OS)"=="WNT" PATCH_FILES+=graphite-2.3.1.patch.mingw -EXTRA_GR_CXX_FLAGS=-nostdinc +EXTRA_GR_CXX_FLAGS=-mthreads -nostdinc .IF "$(MINGW_SHARED_GCCLIB)"=="YES" EXTRA_GR_CXX_FLAGS+=-shared-libgcc .ENDIF @@ -110,7 +110,7 @@ EXTRA_GR_LD_FLAGS+=-no-undefined # don't use SOLARLIB for LDFLAGS because it pulls in system graphite so build will fail # -CONFIGURE_ACTION=bash -c 'CXXFLAGS="$(INCLUDE) $(CFLAGSCXX) $(CFLAGSCOBJ) $(CDEFS) $(CDEFSOBJ) $(SOLARINC) $(LFS_CFLAGS) $(EXTRA_GR_CXX_FLAGS)" $(GR_LIB_PATH) LDFLAGS="-L$(SOLARVERSION)/$(INPATH)/lib$(UPDMINOREXT) $(EXTRA_GR_LD_FLAGS)" ./configure $(GR_CONFIGURE_FLAGS)' +CONFIGURE_ACTION=bash -c 'CXXFLAGS="$(INCLUDE) $(CFLAGSCXX) $(CFLAGSCOBJ) $(CDEFS) $(CDEFSOBJ) $(SOLARINC) $(LFS_CFLAGS) $(EXTRA_GR_CXX_FLAGS)" $(GR_LIB_PATH) LDFLAGS="-L$(SOLARVERSION)/$(INPATH)/lib$(UPDMINOREXT) $(EXTRA_GR_LD_FLAGS) -Wl,--enable-runtime-pseudo-reloc-v2" ./configure $(GR_CONFIGURE_FLAGS)' .ENDIF BUILD_DIR=$(CONFIGURE_DIR) diff --git a/hunspell/makefile.mk b/hunspell/makefile.mk index 50916926d3f4..253607ab0c0f 100644 --- a/hunspell/makefile.mk +++ b/hunspell/makefile.mk @@ -75,7 +75,7 @@ PATCH_FILES=\ hunspell-mingw.patch CONFIGURE_ACTION=configure -CONFIGURE_FLAGS= --disable-shared --with-pic LDFLAGS=-Wl,--enable-auto-import +CONFIGURE_FLAGS= --disable-shared --with-pic LDFLAGS=-Wl,--enable-runtime-pseudo-reloc-v2 BUILD_ACTION=make OUT2LIB=$(BUILD_DIR)$/src$/hunspell$/.libs$/libhunspell-1.2.a .ELSE diff --git a/icu/makefile.mk b/icu/makefile.mk index 70ff42c1a443..2fafcfa75e8d 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -158,6 +158,7 @@ icu_LIBS=-lmingwthrd .IF "$(MINGW_SHARED_GXXLIB)"=="YES" icu_LIBS+=-lstdc++_s .ENDIF +icu_LDFLAGS+=-Wl,--enable-runtime-pseudo-reloc-v2 CONFIGURE_ACTION+=sh -c 'CFLAGS="-O -D_MT" CXXFLAGS="-O -D_MT" LDFLAGS="$(icu_LDFLAGS)" LIBS="$(icu_LIBS)" ./configure --build=i586-pc-mingw32 --enable-layout --enable-static --enable-shared=yes --enable-64bit-libs=no' #CONFIGURE_FLAGS=--enable-layout --enable-static --enable-shared=yes --enable-64bit-libs=no diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk index 9175391fbae8..057b92a8c121 100644 --- a/libxml2/makefile.mk +++ b/libxml2/makefile.mk @@ -57,17 +57,17 @@ PATCH_FILES=$(TARFILE_NAME).patch .IF "$(OS)"=="WNT" .IF "$(COM)"=="GCC" PATCH_FILES+=$(TARFILE_NAME)-mingw.patch -xml2_CC=$(CC) +xml2_CC=$(CC) -mthreads .IF "$(MINGW_SHARED_GCCLIB)"=="YES" xml2_CC+=-shared-libgcc .ENDIF -xml2_LIBS=-lws2_32 -lmingwthrd +xml2_LIBS=-lws2_32 .IF "$(MINGW_SHARED_GXXLIB)"=="YES" xml2_LIBS+=-lstdc++_s .ENDIF CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure -CONFIGURE_FLAGS=--enable-ipv6=no --without-python --without-zlib --enable-static=no --without-debug --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CC="$(xml2_CC)" CFLAGS=-D_MT LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc -L$(ILIB:s/;/ -L/)" LIBS="$(xml2_LIBS)" OBJDUMP="$(WRAPCMD) objdump" +CONFIGURE_FLAGS=--enable-ipv6=no --without-python --without-zlib --enable-static=no --without-debug --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CC="$(xml2_CC)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc -L$(ILIB:s/;/ -L/)" LIBS="$(xml2_LIBS)" OBJDUMP="$(WRAPCMD) objdump" BUILD_ACTION=$(GNUMAKE) BUILD_DIR=$(CONFIGURE_DIR) .ELSE diff --git a/libxslt/makefile.mk b/libxslt/makefile.mk index 3cde964e53c4..29f05b8c297a 100644 --- a/libxslt/makefile.mk +++ b/libxslt/makefile.mk @@ -55,17 +55,17 @@ PATCH_FILES=$(TARFILE_NAME).patch $(TARFILE_NAME)_win_manifest.patch # This is only for UNX environment now .IF "$(OS)"=="WNT" .IF "$(COM)"=="GCC" -xslt_CC=$(CC) +xslt_CC=$(CC) -mthreads .IF "$(MINGW_SHARED_GCCLIB)"=="YES" xslt_CC+=-shared-libgcc .ENDIF -xslt_LIBS=-lmingwthrd +xslt_LIBS= .IF "$(MINGW_SHARED_GXXLIB)"=="YES" xslt_LIBS+=-lstdc++_s .ENDIF CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure -CONFIGURE_FLAGS=--enable-ipv6=no --without-crypto --without-python --enable-static=no --with-sax1=yes --build=i586-pc-mingw32 --host=i586-pc-mingw32 CC="$(xslt_CC)" CFLAGS="$(xslt_CFLAGS) -D_MT" LDFLAGS="-no-undefined -L$(ILIB:s/;/ -L/)" LIBS="$(xslt_LIBS)" LIBXML2LIB=$(LIBXML2LIB) OBJDUMP="$(WRAPCMD) objdump" +CONFIGURE_FLAGS=--enable-ipv6=no --without-crypto --without-python --enable-static=no --with-sax1=yes --build=i586-pc-mingw32 --host=i586-pc-mingw32 CC="$(xslt_CC)" CFLAGS="$(xslt_CFLAGS)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc-v2 -L$(ILIB:s/;/ -L/)" LIBS="$(xslt_LIBS)" LIBXML2LIB=$(LIBXML2LIB) OBJDUMP="$(WRAPCMD) objdump" BUILD_ACTION=chmod 777 xslt-config && $(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) diff --git a/python/makefile.mk b/python/makefile.mk index 86d9835e8604..a35e596669a0 100644 --- a/python/makefile.mk +++ b/python/makefile.mk @@ -93,6 +93,7 @@ python_LDFLAGS=-mno-cygwin -mthreads .IF "$(MINGW_SHARED_GCCLIB)"=="YES" python_LDFLAGS+=-shared-libgcc .ENDIF +python_LDFLAGS+=-shared-libgcc -Wl,--enable-runtime-pseudo-reloc-v2 CONFIGURE_ACTION=./configure --prefix=$(MYCWD)/python-inst --enable-shared CC="$(CC:s/guw.exe //)" CXX="$(CXX:s/guw.exe //)" MACHDEP=MINGW32 LN="cp -p" CFLAGS="$(python_CFLAGS)" LDFLAGS="$(python_LDFLAGS)" BUILD_ACTION=$(ENV_BUILD) make && make install .ELSE |