[Libreoffice-commits] .: 2 commits - icu/icu4c-build.patch icu/makefile.mk

[Fridrich Strba]

 icu/icu4c-build.patch |    2 +-
 icu/makefile.mk       |    9 ++-------
 2 files changed, 3 insertions(+), 8 deletions(-)

New commits:
commit 39ab7d44f3d19b86fd56a518e83456d9556cfaa0
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Fri Mar 18 12:17:56 2011 +0100

    Don't build static icu that nobody uses

diff --git a/icu/makefile.mk b/icu/makefile.mk
index a7c41a9..441eaf8 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=
 
commit 8fa7f8b90f2817542f7f50c937f2a372f98b4bda
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Fri Mar 18 12:05:11 2011 +0100

    Work around a strange problem with libicudata on Mac OSX

diff --git a/icu/icu4c-build.patch b/icu/icu4c-build.patch
index 9920f7a..e5e4bd9 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=