[Libreoffice-commits] core.git: icu/ExternalProject_icu.mk icu/icu4c-build.patch

[Stephan Bergmann]

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

New commits:
commit 7f17b33acc8c3076f0696542795a1ca74ee2d671
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri May 17 10:50:00 2013 +0200

    Fix icu library paths for Mac OS X
    
    There already was a patch to use @executable_path (which is wrong, consider e.g.
    when such libs are loaded into the URE uno executable), so fix it to use
    @_..._OOO instead (and no need to set --prefix), and pass the resulting libs
    through macosx-change-install-names.
    
    Change-Id: I2eb1801b64de81ac2b2844f893c9149fc78c3aa9

diff --git a/icu/ExternalProject_icu.mk b/icu/ExternalProject_icu.mk
index 5ec0933..695c071 100644
--- a/icu/ExternalProject_icu.mk
+++ b/icu/ExternalProject_icu.mk
@@ -74,13 +74,19 @@ $(call gb_ExternalProject_get_state_target,icu,build) :
 			$(if $(filter IOS ANDROID,$(OS)),--disable-dyload) \
 			$(if $(filter ANDROID,$(OS)),--disable-strict) \
 			$(if $(filter SOLARIS AIX,$(OS)),--disable-64bit-libs) \
-			$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
 			$(if $(filter TRUE,$(DISABLE_DYNLOADING)),\
 				--enable-static --disable-shared,\
 				--disable-static --enable-shared $(if $(filter ANDROID,$(OS)),--with-library-suffix=lo)) \
 			$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)\
 				--with-cross-build=$(subst $(INPATH),$(INPATH_FOR_BUILD),$(call gb_UnpackedTarball_get_dir,icu))/source)\
 		&& $(MAKE) \
+		$(if $(filter MACOSX,$(OS)),&& $(PERL) \
+			$(SOLARENV)/bin/macosx-change-install-names.pl shl OOO \
+			$(gb_Package_SOURCEDIR_icu)/source/lib/libicudata$(gb_Library_DLLEXT).$(icu_VERSION) \
+			$(gb_Package_SOURCEDIR_icu)/source/lib/libicuuc$(gb_Library_DLLEXT).$(icu_VERSION) \
+			$(gb_Package_SOURCEDIR_icu)/source/lib/libicui18n$(gb_Library_DLLEXT).$(icu_VERSION) \
+			$(gb_Package_SOURCEDIR_icu)/source/lib/libicule$(gb_Library_DLLEXT).$(icu_VERSION) \
+			$(gb_Package_SOURCEDIR_icu)/source/lib/libicutu$(gb_Library_DLLEXT).$(icu_VERSION)) \
 	,source)
 
 endif
diff --git a/icu/icu4c-build.patch b/icu/icu4c-build.patch
index cf6e682..30ba3ad 100644
--- a/icu/icu4c-build.patch
+++ b/icu/icu4c-build.patch
@@ -52,7 +52,7 @@
 -else
 -LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(notdir $(MIDDLE_SO_TARGET))
 -endif
-+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))
++LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name @__________________________________________________OOO/$(notdir $(MIDDLE_SO_TARGET))
  
  ## Compiler switch to embed a runtime search path
  LD_RPATH=