Kaydet (Commit) 67f76225 authored tarafından Jan Holesovsky's avatar Jan Holesovsky

Fix some icu cross-building problems.

Still it does not finish, though; to be continued.
üst 2d7c9298
--- 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)
...@@ -51,7 +51,8 @@ PATCH_FILES=\ ...@@ -51,7 +51,8 @@ PATCH_FILES=\
icu4c-aix.patch \ icu4c-aix.patch \
icu4c-4_4_2-wchar_t.patch \ icu4c-4_4_2-wchar_t.patch \
icu4c-warnings.patch \ icu4c-warnings.patch \
icu4c-escapespace.patch icu4c-escapespace.patch \
icu4c-strict-c.patch
.IF "$(GUI)"=="UNX" .IF "$(GUI)"=="UNX"
...@@ -187,8 +188,16 @@ icu_LIBS= ...@@ -187,8 +188,16 @@ icu_LIBS=
icu_LIBS+=$(MINGW_SHARED_LIBSTDCPP) icu_LIBS+=$(MINGW_SHARED_LIBSTDCPP)
.ENDIF .ENDIF
icu_LDFLAGS+=-Wl,--enable-runtime-pseudo-reloc-v2 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_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= CONFIGURE_FLAGS=
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment