mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tdf#101789 work around DYLD_LIBRARY_PATH limitations on newer MacOS X

Browse Source 
Change-Id: I6e3cbff1ec7a75e896ba5bafb9d1fbccc3bc8909
This commit is contained in:
Lionel Elie Mamane
2016-11-22 08:55:38 +01:00
parent a306168816
commit 6040dfb5ec
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
external/firebird/ExternalProject_firebird.mk vendored
View File

@@ -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 \

8
external/firebird/firebird-macosx.patch.1 vendored
View File

@@ -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();