diff options
| -rw-r--r-- | berkeleydb/makefile.mk | 10 | ||||
| -rw-r--r-- | cairo/cairo/makefile.mk | 11 | ||||
| -rw-r--r-- | curl/makefile.mk | 10 | ||||
| -rw-r--r-- | icu/icu-4.0.patch | 13 | ||||
| -rw-r--r-- | icu/makefile.mk | 13 | ||||
| -rwxr-xr-x | libxml2/libxml2-2.6.31-mingw.patch | 13 | ||||
| -rw-r--r-- | libxml2/makefile.mk | 11 | ||||
| -rw-r--r-- | libxslt/makefile.mk | 10 | ||||
| -rw-r--r-- | python/Python-2.6.1-mingw.patch | 6 | ||||
| -rw-r--r-- | python/makefile.mk | 3 |
10 files changed, 85 insertions, 15 deletions
diff --git a/berkeleydb/makefile.mk b/berkeleydb/makefile.mk index 5c8f5905248e..fd9f4d7f1b64 100644 --- a/berkeleydb/makefile.mk +++ b/berkeleydb/makefile.mk @@ -129,7 +129,7 @@ OUT2INC= \ CONFIGURE_DIR=out #relative to CONFIGURE_DIR # TODO needs clean up -CPPFLAGS+=-nostdinc -D_MT +CFLAGS+=-nostdinc -D_MT db_CC=$(CC) db_CXX=$(CXX) .IF "$(MINGW_SHARED_GCCLIB)"=="YES" @@ -140,10 +140,7 @@ db_LDFLAGS=-no-undefined -L$(SOLARVER)/$(INPATH)/lib -L$(SOLARVER)/$(INPATH)/bin .IF "$(USE_MINGW)"=="cygwin" db_LDFLAGS+=-L$(COMPATH)/lib/mingw -L$(COMPATH)/lib/w32api .ENDIF -db_LDFLAGS+=-L$(COMPATH)/lib -.IF "$(MINGW_CLIB_DIR)"!="" -db_LDFLAGS+=-L$(MINGW_CLIB_DIR) -.ENDIF +db_LDFLAGS+=-L$(COMPATH)/lib -L$(MINGW_CLIB_DIR) db_LIBS=-lmingwthrd .IF "$(MINGW_SHARED_GXXLIB)"=="YES" db_LIBS+=-lstdc++_s @@ -153,8 +150,7 @@ db_LIBXSO_LIBS=$(LIBSTLPORT) $(db_LIBS) db_LIBXSO_LIBS+=-lgcc_s .ENDIF CONFIGURE_ACTION=..$/dist$/configure -#CONFIGURE_FLAGS=--enable-cxx --enable-dynamic --enable-shared --build=i586-pc-mingw32 --host=i586-pc-mingw32 --enable-mingw LN_S=ln NM="$(WRAPCMD) nm" OBJDUMP="$(WRAPCMD) objdump" JAVA="$(WRAPCMD) -env java" JAVAC="$(WRAPCMD) -env javac" CFLAGS="$(CFLAGS)" CPPFLAGS="$(INCLUDE)" LIBS="-lmingwthrd" LIBSO_LIBS="-lmingwthrd" LIBJSO_LIBS="-lmingwthrd" LIBXSO_LIBS="-lmingwthrd $(LIBSTLPORT)" -CONFIGURE_FLAGS=--disable-cxx --enable-dynamic --enable-shared --build=i586-pc-mingw32 --host=i586-pc-mingw32 --enable-mingw CC="$(db_CC)" CXX="$(db_CXX)" LN_S=ln NM="$(WRAPCMD) nm" OBJDUMP="$(WRAPCMD) objdump" JAVA="$(WRAPCMD) -env java" JAVAC="$(WRAPCMD) -env javac" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS) $(INCLUDE)" LDFLAGS="$(db_LDFLAGS)" LIBS="$(db_LIBS)" LIBSO_LIBS="$(db_LIBS)" LIBJSO_LIBS="$(db_LIBS)" LIBXSO_LIBS="$(db_LIBXSO_LIBS)" +CONFIGURE_FLAGS=--enable-cxx --enable-dynamic --enable-shared --build=i586-pc-mingw32 --host=i586-pc-mingw32 --enable-mingw CC="$(db_CC)" CXX="$(db_CXX)" LN_S=ln NM="$(WRAPCMD) nm" OBJDUMP="$(WRAPCMD) objdump" JAVA="$(WRAPCMD) -env java" JAVAC="$(WRAPCMD) -env javac" CFLAGS="$(CFLAGS)" CPPFLAGS="$(INCLUDE)" LDFLAGS="$(db_LDFLAGS)" LIBS="$(db_LIBS)" LIBSO_LIBS="$(db_LIBS)" LIBJSO_LIBS="$(db_LIBS)" LIBXSO_LIBS="$(db_LIBXSO_LIBS)" BUILD_DIR=$(CONFIGURE_DIR) BUILD_DIR_OUT=$(CONFIGURE_DIR) diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk index 59a3a3538e9d..16dcb4fc0700 100644 --- a/cairo/cairo/makefile.mk +++ b/cairo/cairo/makefile.mk @@ -74,10 +74,19 @@ cairo_CPPFLAGS+=$(INCLUDE) cairo_CFLAGS+=-D_MT cairo_LDFLAGS+=-no-undefined -L$(ILIB:s/;/ -L/) cairo_CPPFLAGS+=-nostdinc +cairo_CC=$(CC) +cairo_LIBS+=-lmingwthrd + +.IF "$(MINGW_SHARED_GCCLIB)"=="YES" +cairo_CC+=-shared-libgcc +.ENDIF +.IF "$(MINGW_SHARED_GXXLIB)"=="YES" +cairo_LIBS+=-lstdc++_s +.ENDIF CONFIGURE_DIR= CONFIGURE_ACTION=cp $(SRC_ROOT)$/$(PRJNAME)$/cairo$/dummy_pkg_config . && .$/configure -CONFIGURE_FLAGS=--disable-xlib --disable-ft --disable-pthread --disable-svg --disable-png --enable-gtk-doc=no --enable-test-surfaces=no --enable-static=no --build=i586-pc-mingw32 --host=i586-pc-mingw32 PKG_CONFIG=./dummy_pkg_config LIBS=-lmingwthrd ZLIB3RDLIB=$(ZLIB3RDLIB) COMPRESS=$(cairo_COMPRESS) OBJDUMP="$(WRAPCMD) objdump" +CONFIGURE_FLAGS=--disable-xlib --disable-ft --disable-pthread --disable-svg --disable-png --enable-gtk-doc=no --enable-test-surfaces=no --enable-static=no --build=i586-pc-mingw32 --host=i586-pc-mingw32 PKG_CONFIG=./dummy_pkg_config CC="$(cairo_CC)" LIBS="$(cairo_LIBS)" ZLIB3RDLIB=$(ZLIB3RDLIB) COMPRESS=$(cairo_COMPRESS) 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 f836e046c486..d3ad3ba28bae 100644 --- a/curl/makefile.mk +++ b/curl/makefile.mk @@ -87,10 +87,18 @@ OUT2LIB=$(BUILD_DIR)$/.libs$/libcurl$(DLLPOST).3 .IF "$(GUI)"=="WNT" .IF "$(COM)"=="GCC" +curl_CC=$(CC) +.IF "$(MINGW_SHARED_GCCLIB)"=="YES" +curl_CC+=-shared-libgcc +.ENDIF +curl_LIBS=-lws2_32 -lwinmm -lmingwthrd +.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 OBJDUMP="$(WRAPCMD) objdump" CFLAGS=-D_MT LDFLAGS="-L$(ILIB:s/;/ -L/)" LIBS="-lws2_32 -lwinmm -lmingwthrd" +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)" OBJDUMP="$(WRAPCMD) objdump" CFLAGS=-D_MT 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/icu/icu-4.0.patch b/icu/icu-4.0.patch index cb46b9c71cae..172d6244634c 100644 --- a/icu/icu-4.0.patch +++ b/icu/icu-4.0.patch @@ -9,6 +9,19 @@ #define _XOPEN_SOURCE_EXTENDED 1 #endif +--- misc/icu/source/common/unicode/pwin32.h 2008-07-01 10:41:12.000000000 +0900 ++++ misc/build/icu/source/common/unicode/pwin32.h 2008-11-05 22:37:21.479250000 +0900 +@@ -32,6 +32,10 @@ + #define __STDC_CONSTANT_MACROS + #endif + ++#if defined(__MINGW32__) ++#define U_HAVE_INTTYPES_H 1 ++#endif ++ + /* _MSC_VER is used to detect the Microsoft compiler. */ + #if defined(_MSC_VER) + #define U_INT64_IS_LONG_LONG 0 --- misc/icu/source/config/mh-darwin Tue Jul 1 03:41:24 2008 +++ misc/build/icu/source/config/mh-darwin Tue Jan 20 18:33:16 2009 @@ -25,7 +25,7 @@ diff --git a/icu/makefile.mk b/icu/makefile.mk index 6b3c15a158c8..71e2c911fc80 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -149,11 +149,18 @@ OUT2BIN= \ CONFIGURE_DIR=source .IF "$(COM)"=="GCC" CONFIGURE_ACTION=rm data/mappings/ucm*.mk data/translit/trn*.mk ; +.IF "$(MINGW_SHARED_GCCLIB)"=="YES" +icu_LDFLAGS+=-shared-libgcc +.ENDIF .IF "$(USE_MINGW)"=="cygwin" -CONFIGURE_ACTION+=sh -c 'CFLAGS="-O -D_MT" CXXFLAGS="-O -D_MT" LDFLAGS="-L$(COMPATH)/lib/mingw -L$(COMPATH)/lib/w32api -L$(COMPATH)$/lib" LIBS="-lmingwthrd" ./configure --build=i586-pc-mingw32 --enable-layout --enable-static --enable-shared=yes --enable-64bit-libs=no' -.ELSE -CONFIGURE_ACTION+=sh -c 'CFLAGS="-O -D_MT" CXXFLAGS="-O -D_MT" LDFLAGS="-L$(COMPATH)$/lib" LIBS="-lmingwthrd" ./configure --build=i586-pc-mingw32 --enable-layout --enable-static --enable-shared=yes --enable-64bit-libs=no' +icu_LDFLAGS+=-L$(COMPATH)/lib/mingw -L$(COMPATH)/lib/w32api +.ENDIF +icu_LDFLAGS+=-L$(COMPATH)$/lib +icu_LIBS=-lmingwthrd +.IF "$(MINGW_SHARED_GXXLIB)"=="YES" +icu_LIBS+=-lstdc++_s .ENDIF +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 CONFIGURE_FLAGS= diff --git a/libxml2/libxml2-2.6.31-mingw.patch b/libxml2/libxml2-2.6.31-mingw.patch new file mode 100755 index 000000000000..102ef3e2dbb2 --- /dev/null +++ b/libxml2/libxml2-2.6.31-mingw.patch @@ -0,0 +1,13 @@ +--- misc/libxml2-2.6.31/libxml.h 2007-11-23 19:47:23.000000000 +0900 ++++ misc/build/libxml2-2.6.31/libxml.h 2009-07-10 14:37:34.988250000 +0900 +@@ -30,6 +30,10 @@ + #include <libxml/xmlversion.h> + #else + #include "config.h" ++#ifdef __MINGW32__ ++#undef HAVE_LIBPTHREAD ++#undef HAVE_PTHREAD_H ++#endif + #include <libxml/xmlversion.h> + #endif + diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk index 7ae2265271b8..b99c52f6aa88 100644 --- a/libxml2/makefile.mk +++ b/libxml2/makefile.mk @@ -59,9 +59,18 @@ PATCH_FILES=$(TARFILE_NAME).patch .IF "$(OS)"=="WNT" .IF "$(COM)"=="GCC" +PATCH_FILES+=$(TARFILE_NAME)-mingw.patch +xml2_CC=$(CC) +.IF "$(MINGW_SHARED_GCCLIB)"=="YES" +xml2_CC+=-shared-libgcc +.ENDIF +xml2_LIBS=-lws2_32 -lmingwthrd +.IF "$(MINGW_SHARED_GXXLIB)"=="YES" +xml2_LIBS+=-lstdc++_s +.ENDIF CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure -CONFIGURE_FLAGS=--enable-ipv6=no --without-python --enable-static=no --without-debug --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CFLAGS=-D_MT LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc -L$(ILIB:s/;/ -L/)" LIBS="-lws2_32 -lmingwthrd" OBJDUMP="$(WRAPCMD) objdump" +CONFIGURE_FLAGS=--enable-ipv6=no --without-python --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" BUILD_ACTION=$(GNUMAKE) BUILD_DIR=$(CONFIGURE_DIR) .ELSE diff --git a/libxslt/makefile.mk b/libxslt/makefile.mk index 76cbcd39be39..ba335eed7e19 100644 --- a/libxslt/makefile.mk +++ b/libxslt/makefile.mk @@ -57,9 +57,17 @@ PATCH_FILES=$(TARFILE_NAME).patch $(TARFILE_NAME)_win_manifest.patch .IF "$(OS)"=="WNT" .IF "$(COM)"=="GCC" +xslt_CC=$(CC) +.IF "$(MINGW_SHARED_GCCLIB)"=="YES" +xslt_CC+=-shared-libgcc +.ENDIF +xslt_LIBS=-lmingwthrd +.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 CFLAGS="$(xslt_CFLAGS) -D_MT" LDFLAGS="$(xslt_LDFLAGS) -no-undefined -L$(ILIB:s/;/ -L/)" LIBS="-lmingwthrd" 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) -D_MT" LDFLAGS="-no-undefined -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/Python-2.6.1-mingw.patch b/python/Python-2.6.1-mingw.patch index 63067227c112..26bc4cbd0648 100644 --- a/python/Python-2.6.1-mingw.patch +++ b/python/Python-2.6.1-mingw.patch @@ -1,6 +1,6 @@ --- misc/Python-2.6.1/Include/pyport.h 2008-06-11 16:41:16.000000000 +0900 +++ misc/build/Python-2.6.1/Include/pyport.h 2009-03-29 23:28:13.859000000 +0900 -@@ -3,6 +3,26 @@ +@@ -3,6 +3,30 @@ #include "pyconfig.h" /* include for defines */ @@ -9,6 +9,7 @@ +#undef HAVE_OPENPTY +#undef HAVE_DEV_PTMX +#undef _POSIX_THREADS ++#undef HAVE_PTHREAD_H +#define MS_WINDOWS +#define MS_WIN32 +#define Py_WIN_WIDE_FILENAMES @@ -18,6 +19,9 @@ +#define NT_THREADS +#define WITH_THREAD +#define WINVER 0x0501 ++#ifdef socklen_t ++#undef socklen_t ++#endif +#define HAVE_ADDRINFO +#define HAVE_GETADDRINFO +#define HAVE_GETNAMEINFO diff --git a/python/makefile.mk b/python/makefile.mk index a84fccb6c9fc..663a5604603d 100644 --- a/python/makefile.mk +++ b/python/makefile.mk @@ -95,6 +95,9 @@ BUILD_DIR= MYCWD=$(shell cygpath -m $(shell @pwd))/$(INPATH)/misc/build python_CFLAGS=-mno-cygwin -mthreads python_LDFLAGS=-mno-cygwin -mthreads +.IF "$(MINGW_SHARED_GCCLIB)"=="YES" +python_LDFLAGS+=-shared-libgcc +.ENDIF 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 |