[Libreoffice-commits] core.git: external/firebird

[Lionel Elie Mamane]

 external/firebird/ExternalProject_firebird.mk |    1 +
 external/firebird/firebird-macosx.patch.1     |    8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 6040dfb5ecf9945ba9c47a87a92506ad8bc88f0b
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Tue Nov 22 08:55:38 2016 +0100

    tdf#101789 work around DYLD_LIBRARY_PATH limitations on newer MacOS X
    
    Change-Id: I6e3cbff1ec7a75e896ba5bafb9d1fbccc3bc8909

diff --git a/external/firebird/ExternalProject_firebird.mk b/external/firebird/ExternalProject_firebird.mk
index 3467cc0..f76606d 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -73,6 +73,7 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
 				-L$(call gb_UnpackedTarball_get_dir,icu)/source/lib \
 			) \
 		" \
+		&& export LIBREOFFICE_ICU_LIB="$(call gb_UnpackedTarball_get_dir,icu)/source/lib" \
 		&& MAKE=$(MAKE) ./configure \
 			--without-editline \
 			--with-wire-compress=no \
diff --git a/external/firebird/firebird-macosx.patch.1 b/external/firebird/firebird-macosx.patch.1
index b9a685b..8961c42 100644
--- a/external/firebird/firebird-macosx.patch.1
+++ b/external/firebird/firebird-macosx.patch.1
@@ -110,11 +110,15 @@
  #elif defined(HPUX)
  const char* const inTemplate = "libicui18n.sl.%s";
  const char* const ucTemplate = "libicuuc.sl.%s";
-@@ -353,6 +353,12 @@
+@@ -353,6 +353,16 @@
  		s.printf("%d%d", majorVersion, minorVersion);
  
  	filename.printf(templateName, s.c_str());
-+	const char * const envpath = getenv("LIBREOFFICE_FIREBIRD_LIB");
++	const char * envpath = getenv("LIBREOFFICE_FIREBIRD_LIB");
++	if(envpath == nullptr)
++	{
++		envpath = getenv("LIBREOFFICE_ICU_LIB");
++	}
 +	if(envpath != nullptr)
 +	{
 +		s = filename.c_str();