diff options
| author | Michael Stahl <mstahl@redhat.com> | 2018-02-20 17:48:46 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-02-21 14:14:58 +0100 |
| commit | db48a3ec98a1cf2bccd157c2db06eb6146011c45 (patch) | |
| tree | 2e83aef746641f116140909cf13a3e93c3eef865 /external | |
| parent | 91374342ba491234a46aeb4b554b5e379869f301 (diff) | |
gpgmepp,xmlsecurity: fix testODFEncryptedGPG() failure caused...
...by CppunitTest setting LD_LIBRARY_PATH to include instdir/program.
This causes the spawned gpg-agent to load instdir/program/libassuan.so.0
instead of /usr/... and fail with:
writev(2, [{iov_base="gpg-agent", iov_len=9}, {iov_base=": ",
iov_len=2}, {iov_base="relocation error", iov_len=16}, {iov_base=": ",
iov_len=2}, {iov_base="gpg-agent", iov_len=9}, {iov_base=": ",
iov_len=2}, {iov_base="symbol assuan_sock_set_system_ho"...,
iov_len=118}, {iov_base="", iov_len=0}, {iov_base="", iov_len=0},
{iov_base="\n", iov_len=1}], 10) = 159
The failure happens in the libreoffice-6-0 branch on Fedora 27, whereas
the master branch doesn't fail because it has a newer version of
libassuan that happens to provide the required symbol.
Fix this by applying the patch that was added for ASAN in
d15f042abd5a1093984a0c8380837145f38c4efc to clear LD_LIBRARY_PATH
always on Linux.
Change-Id: I6a5c7fdfdd32234f39a182581b03d79739880c11
Reviewed-on: https://gerrit.libreoffice.org/50056
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit 81e4be9cd39f1ae794a96471bf48637312a0f781)
Reviewed-on: https://gerrit.libreoffice.org/50059
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/gpgmepp/UnpackedTarball_gpgmepp.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/external/gpgmepp/UnpackedTarball_gpgmepp.mk b/external/gpgmepp/UnpackedTarball_gpgmepp.mk index 931d163d7576..df13d4976c7e 100644 --- a/external/gpgmepp/UnpackedTarball_gpgmepp.mk +++ b/external/gpgmepp/UnpackedTarball_gpgmepp.mk @@ -23,6 +23,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,gpgmepp, \ $(if $(filter MSC,$(COM)),external/gpgmepp/w32-fix-libtool.patch.1) \ $(if $(filter MSC,$(COM)),external/gpgmepp/w32-add-initializer.patch.1) \ external/gpgmepp/w32-build-fixes-2.patch \ - $(if $(ENABLE_RUNTIME_OPTIMIZATIONS),,external/gpgmepp/asan.patch) \ + $(if $(filter LINUX,$(OS)),external/gpgmepp/asan.patch) \ )) # vim: set noet sw=4 ts=4: |