From 27eb23369f9e250e71cfea8524a71f962e93b8fd Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 22 Nov 2022 14:46:51 +0100 Subject: Work around system(3) dropping DYLD_LIBRARY_PATH on macOS ...which caused `make translations` fail for me with > [POT] pot.done > dyld[96290]: Library not loaded: @__VIA_LIBRARY_PATH__/libuno_sal.dylib.3 > Referenced from: .../workdir/LinkTarget/Executable/cfgex > Reason: tried: '/System/Volumes/Preboot/Cryptexes/OS@__VIA_LIBRARY_PATH__/libuno_sal.dylib.3' (no such file), '/usr/local/lib/libuno_sal.dylib.3' (no such file), '/usr/lib/libuno_sal.dylib.3' (no such file, not in dyld cache) > Error: Failed to execute .../workdir/LinkTarget/Executable/cfgex -i .../connectivity/registry/ado/org/openoffice/Office/DataAccess/Drivers.xcu -o .../workdir//pot/connectivity/registry/ado/org/openoffice/Office/DataAccess.pot (This is the opposite case to 17cfd43e28c45626b1e0990bd0e51fdc97409ebe "Avoid external processes picking up instdir/program/libxml2.so.2". Here, the executables called from Executable_localize are LO-internal executables that need the libraries in instdir/. There, the scripts called from Executable_localize in turn only call external tools that shall not accidentally pick up LO-internal libraries from instdir/.) Change-Id: Ib1aa240ee47a21d14ec0463fee85bebe82453cee Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143118 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- l10ntools/source/localize.cxx | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'l10ntools/source') diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx index c5ffd6d5c060..96037c991927 100644 --- a/l10ntools/source/localize.cxx +++ b/l10ntools/source/localize.cxx @@ -109,6 +109,11 @@ void handleCommand( } else { +#if defined MACOSX + if (auto const env = getenv("DYLD_LIBRARY_PATH")) { + buf.append(OString::Concat("DYLD_LIBRARY_PATH=") + env + " "); + } +#endif auto const env = getenv("WORKDIR_FOR_BUILD"); assert(env != nullptr); buf.append(env); -- cgit n> LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/udkapi
AgeCommit message (Expand)Author
2014-07-23TyposJulien Nabet
2014-06-19Work around problem with nested /* in Doxygen commentStephan Bergmann
2014-05-17Correct common misspellings, and remove some ASCII art along the way.Chris Laplante
2014-05-01Many spelling fixes: directories r* - z*.Pedro Giffuni
2014-04-14typo: postion -> positionThomas Arnhold
2014-04-14typo: independend -> independentThomas Arnhold
2014-04-11Update the reference rdbs to libreoffice-4-2-0Stephan Bergmann
2014-04-11Sort constant group membersStephan Bergmann
2014-03-29typo: inteface -> interfaceThomas Arnhold
2014-03-29typo: decription -> descriptionThomas Arnhold
2014-03-26Close those <p> tags.Kohei Yoshida
2014-03-12Spelling fix: suportedTor Lillqvist
2014-03-10Deprecate com.sun.star.XTypeProvider.getImplementationIdStephan Bergmann
2014-03-07Introduce com.sun.star.beans.theIntrospection singletonStephan Bergmann
2014-01-31Remove UNOIDL "array" and "union" vaporware remnantsStephan Bergmann
2013-12-20typo fixesAndras Timar