From c0470de216263d617f7e0663babf3eae4483f0db Mon Sep 17 00:00:00 2001 From: Fridrich Štrba Date: Fri, 18 Mar 2011 12:05:11 +0100 Subject: Work around a strange problem with libicudata on Mac OSX --- icu/icu4c-build.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'icu') diff --git a/icu/icu4c-build.patch b/icu/icu4c-build.patch index 9920f7a61eec..e5e4bd9b10a0 100644 --- a/icu/icu4c-build.patch +++ b/icu/icu4c-build.patch @@ -27,7 +27,7 @@ ## Compiler switches to embed a library name and version information -LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(notdir $(MIDDLE_SO_TARGET)) -+LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name @executable_path/$(notdir $(FINAL_SO_TARGET)) ++LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name @executable_path/$(notdir $(MIDDLE_SO_TARGET)) ## Compiler switch to embed a runtime search path LD_RPATH= -- cgit From be52ac8c786426317a4516efc1de3bac80386e94 Mon Sep 17 00:00:00 2001 From: Fridrich Štrba Date: Fri, 18 Mar 2011 12:17:56 +0100 Subject: Don't build static icu that nobody uses --- icu/makefile.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'icu') diff --git a/icu/makefile.mk b/icu/makefile.mk index a7c41a92d32f..441eaf850168 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -107,8 +107,7 @@ LDFLAGSADD += -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new -Wl,--dynamic- CONFIGURE_DIR=source CONFIGURE_ACTION+=sh -c 'CFLAGS="$(icu_CFLAGS)" CXXFLAGS="$(icu_CXXFLAGS)" LDFLAGS="$(icu_LDFLAGS) $(LDFLAGSADD)" \ -./configure --enable-layout --enable-static --enable-shared=yes --disable-icuio --disable-samples --disable-tests \ ---disable-extras $(DISABLE_64BIT)' +./configure --enable-layout --disable-static --enable-shared $(DISABLE_64BIT)' CONFIGURE_FLAGS= @@ -161,12 +160,8 @@ icu_LIBS=-lmingwthrd icu_LIBS+=-lstdc++_s .ENDIF icu_LDFLAGS+=-Wl,--enable-runtime-pseudo-reloc-v2 -CONFIGURE_ACTION+=sh -c 'CFLAGS="$(icu_CFLAGS)" CXXFLAGS="$(icu_CXXFLAGS)" LDFLAGS="$(icu_LDFLAGS) $(LDFLAGSADD)" \ -./configure --enable-layout --enable-static --enable-shared=yes --disable-icuio --disable-samples --disable-tests \ ---disable-extras $(DISABLE_64BIT)' 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 --disable-icuio \ ---disable-samples --disable-tests --disable-extras --enable-64bit-libs=no' +./configure --build=i586-pc-mingw32 --enable-layout --disable-static --enable-shared --enable-64bit-libs=no' CONFIGURE_FLAGS= -- cgit