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 /icu | |
| 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 'icu')
| -rw-r--r-- | icu/icu-4.0.patch | 13 | ||||
| -rw-r--r-- | icu/makefile.mk | 13 |
2 files changed, 23 insertions, 3 deletions
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= |