diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-03-18 16:09:37 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-18 16:09:37 +0100 |
| commit | 9ffd61c43e4df7a0536ad71fc9cd61b814632e29 (patch) | |
| tree | cd17a1c55157b53a66a1956ad32d9c2e4cf17d9c /icu | |
| parent | 0257dbcd07db15a0aeb81d204bb2b22b2819ecb1 (diff) | |
| parent | be52ac8c786426317a4516efc1de3bac80386e94 (diff) | |
Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/libs-extern-sys
Diffstat (limited to 'icu')
| -rw-r--r-- | icu/icu4c-build.patch | 2 | ||||
| -rw-r--r-- | icu/makefile.mk | 9 |
2 files changed, 3 insertions, 8 deletions
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= diff --git a/icu/makefile.mk b/icu/makefile.mk index 32b57191fff0..8dda4b894bc0 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -102,8 +102,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= @@ -156,12 +155,8 @@ icu_LIBS= icu_LIBS+=$(MINGW_SHARED_LIBSTDCPP) .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= |