diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2009-08-26 06:36:38 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2009-08-26 06:36:38 +0000 |
| commit | e863a48ae31253e02dab4454ed1edf22bc87a328 (patch) | |
| tree | a818a663b0f226d81e37197de6190db870b8dbb5 /python | |
| parent | 0a8256ba04e3bc44dd4f21db93af660753c137b7 (diff) | |
CWS-TOOLING: integrate CWS mingwport22
2009-08-19 16:18:46 +0200 tono r275156 : i#103794: mingw gcc-4.4.0 port: make use of dwarf2 eh
2009-08-05 12:27:41 +0200 tono r274650 : CWS-TOOLING: rebase CWS mingwport22 to trunk@274622 (milestone: DEV300:m54)
2009-08-01 00:56:35 +0200 tono r274552 : i#103795: mingw gcc-4.4.0 port: use gcc dll
2009-07-27 00:13:27 +0200 tono r274344 : i#103795: mingw gcc-4.4.0 port: use gcc dll
2009-07-25 06:19:59 +0200 tono r274332 : i#103803: mingw gcc-4.4.0 port: invalid "extern static"
2009-07-25 06:13:56 +0200 tono r274331 : i#103802: mingw gcc-4.4.0 port: inhibit use of pthread
2009-07-25 06:05:22 +0200 tono r274330 : i#103801: mingw gcc-4.4.0 port: specify relocatable data section
2009-07-25 05:54:09 +0200 tono r274329 : i#103800: mingw gcc-4.4.0 port: remove invalid scope
2009-07-25 05:44:58 +0200 tono r274328 : i#103799: mingw gcc-4.4.0 port: add some #include
2009-07-25 05:33:09 +0200 tono r274327 : i#103798: mingw gcc-4.4.0 port: add backward in include path
2009-07-25 05:24:42 +0200 tono r274326 : i#103797: mingw gcc-4.4.0 port: nooptimize c++-uno bridge
2009-07-25 05:16:20 +0200 tono r274325 : i#103795: mingw gcc-4.4.0 port: use gcc dll
2009-07-25 04:01:59 +0200 tono r274324 : i#103794: mingw gcc-4.4.0 port: make use of dwarf2 eh
2009-07-25 02:44:01 +0200 tono r274322 : i#103793: mingw port: Exclude msvc[pr]80.dll from packaging
2009-07-25 02:28:21 +0200 tono r274321 : i#103791: mingw port fix typo
Diffstat (limited to 'python')
| -rw-r--r-- | python/Python-2.6.1-mingw.patch | 6 | ||||
| -rw-r--r-- | python/makefile.mk | 3 |
2 files changed, 8 insertions, 1 deletions
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 |