1c5c31b006
Remove gpgme.git-4b64774b6d13ffa4f59dddf947a97d61bcfa2f2e.patch.1 as it has applied in 1.18.0. * 0001-cpp-Fix-building-with-C-11.patch.1: fixed error "no matching function for call to object of type "(lambda at importresult.cpp:154:71)"". * w32-include.patch: add missing #include <string> (for std::string). * macos-include.patch: add missing #include <algorithm> (for std::any_of). Change-Id: I45f2ef415d80e6ee848699803e971f154812c9c6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143039 Tested-by: Jenkins Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
12 lines
399 B
Diff
12 lines
399 B
Diff
--- src/posix-io.c
|
|
+++ src/posix-io.c
|
|
@@ -563,6 +563,9 @@
|
|
|
|
if (atfork)
|
|
atfork (atforkvalue, 0);
|
|
+ char const * ld_path = getenv("LIBO_LD_PATH");
|
|
+ if (ld_path && setenv("LD_LIBRARY_PATH", ld_path, 1) != 0)
|
|
+ abort();
|
|
|
|
/* First close all fds which will not be inherited. If we
|
|
* have closefrom(2) we first figure out the highest fd we
|