diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2020-01-17 11:13:43 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2020-01-17 12:56:29 +0100 |
commit | a3ca9b88b4b38c008efa868844ba7a3105b4bcca (patch) | |
tree | bb5ac956ca469f07235fb4405b5bb9ee77df0018 /cppuhelper | |
parent | 14ad64270e4fbca3c24da6f55f260b1fb229556a (diff) |
tdf#127619: external/nss: Load smime3 lib with a path on macOS
A plain dlopen("libsmime3.dylib",...) would search (among other places)
DYLD_FALLBACK_LIBRARY_PATH, which when unset defaults to a set of paths
including /usr/local/lib (so would erroneously find Homebrew's
/usr/local/lib/libsmime3.dylib instead of LO's
LibreOffice.app/Contents/Frameworks/libsmime3.dylib next to the calling
LibreOffice.app/Contents/Frameworks/libnspr4.dylib).
At least macOS 10.15.2 supports a "@loader_path/" prefix in dlopen, to find the
requested library next to the calling code, so use that as a quick fix. (Should
that turn out to be problematic, there is PORT_LoadLibraryFromOrigin in
workdir/UnpackedTarball/nss/nss/lib/util/secload.c that might be useful in a
more elaborate fix.)
Change-Id: I8688606017a4b32a2dd55740f67b8fdb36fc5435
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86966
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'cppuhelper')
0 files changed, 0 insertions, 0 deletions