summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLionel Elie Mamane <lionel@mamane.lu>2016-11-22 08:55:38 +0100
committerLionel Elie Mamane <lionel@mamane.lu>2016-11-22 08:55:54 +0100
commit6040dfb5ecf9945ba9c47a87a92506ad8bc88f0b (patch)
treee58a2d810bece7d7d4874d09b0d7b9bb54272313
parenta306168816755058f246dcffebce5c397ac40e98 (diff)
tdf#101789 work around DYLD_LIBRARY_PATH limitations on newer MacOS X
Change-Id: I6e3cbff1ec7a75e896ba5bafb9d1fbccc3bc8909
-rw-r--r--external/firebird/ExternalProject_firebird.mk1
-rw-r--r--external/firebird/firebird-macosx.patch.18
2 files changed, 7 insertions, 2 deletions
diff --git a/external/firebird/ExternalProject_firebird.mk b/external/firebird/ExternalProject_firebird.mk
index 3467cc038405..f76606dbadd9 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 b9a685b4b040..8961c4278924 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();