diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-08-19 18:42:20 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-08-19 18:43:29 +0200 |
| commit | 67f762250276aeaa65b5d96de0e12d45093b947d (patch) | |
| tree | 5abe1fe8acbaefef6e1f12f676997b3395b7a598 /icu | |
| parent | 2d7c9298c050ff21b2dce6f2d6d76c067a74b892 (diff) | |
Fix some icu cross-building problems.
Still it does not finish, though; to be continued.
Diffstat (limited to 'icu')
| -rw-r--r-- | icu/icu4c-strict-c.patch | 11 | ||||
| -rw-r--r-- | icu/makefile.mk | 13 |
2 files changed, 22 insertions, 2 deletions
diff --git a/icu/icu4c-strict-c.patch b/icu/icu4c-strict-c.patch new file mode 100644 index 000000000000..0f1ff9a44808 --- /dev/null +++ b/icu/icu4c-strict-c.patch @@ -0,0 +1,11 @@ +--- misc/build/icu/source/common/wintz.c.orig 2011-08-19 17:13:10.000000000 +0200 ++++ misc/build/icu/source/common/wintz.c 2011-08-19 17:13:35.000000000 +0200 +@@ -113,7 +113,7 @@ static int32_t detectWindowsType() + } + } + +- return winType+1; // +1 to bring it inline with the enum ++ return winType+1; /* +1 to bring it inline with the enum */ + } + + static LONG openTZRegKey(HKEY *hkey, const char *winid) diff --git a/icu/makefile.mk b/icu/makefile.mk index 42ca8386b9aa..41916b4e2e1e 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -51,7 +51,8 @@ PATCH_FILES=\ icu4c-aix.patch \ icu4c-4_4_2-wchar_t.patch \ icu4c-warnings.patch \ - icu4c-escapespace.patch + icu4c-escapespace.patch \ + icu4c-strict-c.patch .IF "$(GUI)"=="UNX" @@ -187,8 +188,16 @@ icu_LIBS= icu_LIBS+=$(MINGW_SHARED_LIBSTDCPP) .ENDIF icu_LDFLAGS+=-Wl,--enable-runtime-pseudo-reloc-v2 + +.IF "$(CROSS_COMPILING)"=="YES" +# We require that the cross-build-toolset target from the top Makefile(.in) has bee built +BUILD_AND_HOST=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --with-cross-build=$(posix_PWD)/$(INPATH_FOR_BUILD)/misc/build/icu/source +.ELSE +BUILD_AND_HOST=--build=i586-pc-mingw32 --enable-64bit-libs=no +.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 --disable-static --enable-shared --enable-64bit-libs=no' +./configure $(BUILD_AND_HOST) --enable-layout --disable-static --enable-shared' CONFIGURE_FLAGS= |