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

[Libreoffice Gerrit user]

 external/librevenge/rpath.patch |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit ec26772e2e9d864b9c2c5e5271ccd63006bec039
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Wed Mar 6 11:56:36 2019 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Mar 6 14:25:50 2019 +0100

    Fix libtool RPATH outsmarting hack for external/librevenge
    
    After the blind fix attempt of 490f07cf7235ab3c5dc4be13c53832e3266bd8e6 "Extend
    libtool RPATH outsmarting hack to external/librevenge", appears that
    <https://ci.libreoffice.org/job/lo_daily_update_gandalf/596/> also needs
    runpath_var=LD_RUN_PATH to be reset.  (See also how
    <https://src.fedoraproject.org/cgit/rpms/librevenge.git/tree/librevenge.spec
    ?id=4960d4c6c190885b20f56ce9ee1ad2ad92b87021#n46> addresses the same problem for
    Fedora builds of librevenge.)
    
    Change-Id: I5cff145605cd05a8b87360c1edc3574e3364139b
    Reviewed-on: https://gerrit.libreoffice.org/68800
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/external/librevenge/rpath.patch b/external/librevenge/rpath.patch
index a27c6b8d4310..c7d21008090d 100644
--- a/external/librevenge/rpath.patch
+++ b/external/librevenge/rpath.patch
@@ -1,10 +1,11 @@
 --- configure
 +++ configure
-@@ -14983,6 +14983,7 @@
+@@ -14983,6 +14983,8 @@
  	    esac
  	    ;;
  	esac
 +hardcode_libdir_flag_spec_CXX=
++runpath_var=
  	;;
  
        lynxos*)