[Libreoffice-commits] core.git: external/gpgmepp

[Stephan Bergmann]

 external/gpgmepp/asan.patch |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 1553cc326c5eb98b658e2202630ba0f0217c0ae4
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Dec 12 12:57:36 2017 +0100

    Make --disable-runtime-optimizations not fail when LIBO_LD_PATH is unset
    
    ...outside of CppunitTest_xmlsecurity_signing
    
    Change-Id: I0679fd3437bdddfdb7b40daddc7c107d9d8fcc90

diff --git a/external/gpgmepp/asan.patch b/external/gpgmepp/asan.patch
index 526da3336504..16d97f6ff307 100644
--- a/external/gpgmepp/asan.patch
+++ b/external/gpgmepp/asan.patch
@@ -1,13 +1,11 @@
 --- src/posix-io.c
 +++ src/posix-io.c
-@@ -468,6 +468,11 @@
+@@ -468,6 +468,9 @@
  
  	  if (atfork)
  	    atfork (atforkvalue, 0);
 +          char const * ld_path = getenv("LIBO_LD_PATH");
-+          if (!ld_path)
-+            abort();
-+          if (setenv("LD_LIBRARY_PATH", ld_path, 1) != 0)
++          if (ld_path && setenv("LD_LIBRARY_PATH", ld_path, 1) != 0)
 +            abort();
  
            /* First close all fds which will not be inherited.  If we