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

[Libreoffice Gerrit user]

 external/librevenge/UnpackedTarball_librevenge.mk |    4 ++++
 external/librevenge/rpath.patch                   |   10 ++++++++++
 2 files changed, 14 insertions(+)

New commits:
commit 490f07cf7235ab3c5dc4be13c53832e3266bd8e6
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Dec 11 11:16:12 2018 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Tue Dec 11 13:35:04 2018 +0100

    Extend libtool RPATH outsmarting hack to external/librevenge
    
    (See 1d028d4783da69c5c0e6e0b59e0f8ac55eb9d2b1 "Fix Linux RPATH of various
    external modules" for the similar patches to other external projects.)  This is
    a blind fix attempt for
    <https://ci.libreoffice.org/job/lo_daily_update_gandalf/559/console>
    
    > /lo/home/tdf/lode/jenkins/workspace/lo_daily_update_gandalf/instdir/program/librevenge-0.0-lo.so.0 has unexpected RPATH  0x000000000000001d (RUNPATH)            Library runpath: [/opt/rh/devtoolset-7/root/usr/lib/../lib64]
    [...]
    > /lo/home/tdf/lode/jenkins/workspace/lo_daily_update_gandalf/postprocess/CustomTarget_check_dynamic_objects.mk:20: recipe for target '/lo/home/tdf/lode/jenkins/workspace/lo_daily_update_gandalf/workdir/CustomTarget/postprocess/check_dynamic_objects/check.done' failed
    
    after ed81fe44d4e6b36c4c61a22e9e28a3a94fef9238 "Enabling Developer Toolset 7 for
    Jenkins' remaining GCC master jobs" enabled GCC 8 at gandalf's
    /opt/rh/devtoolset-7/root/ (which is at the same location as a CentOS Developer
    Toolset 7 special GCC 7, but is actually a plain GCC 8, cf.
    <https://lists.freedesktop.org/archives/libreoffice/2018-December/081544.html>
    "Re: Compiler baselines") for the lo_daily_update_gandalf job.  Presumably
    libtool added to RPATH a path to find that GCC 8 installation's
    /opt/rh/devtoolset-7/root/usr/lib64/libstdc++.so.6.
    
    Change-Id: I18a88b2dcdfcaf2e2d36d5ee1b41ce865e4ac34e
    Reviewed-on: https://gerrit.libreoffice.org/64943
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/external/librevenge/UnpackedTarball_librevenge.mk b/external/librevenge/UnpackedTarball_librevenge.mk
index 7d9972c55962..678da6454586 100644
--- a/external/librevenge/UnpackedTarball_librevenge.mk
+++ b/external/librevenge/UnpackedTarball_librevenge.mk
@@ -15,6 +15,10 @@ $(eval $(call gb_UnpackedTarball_update_autoconf_configs,librevenge))
 
 $(eval $(call gb_UnpackedTarball_set_patchlevel,librevenge,0))
 
+$(eval $(call gb_UnpackedTarball_add_patches,librevenge, \
+    external/librevenge/rpath.patch \
+))
+
 ifeq ($(COM_IS_CLANG),TRUE)
 ifneq ($(filter -fsanitize=%,$(CC)),)
 $(eval $(call gb_UnpackedTarball_add_patches,librevenge, \
diff --git a/external/librevenge/rpath.patch b/external/librevenge/rpath.patch
new file mode 100644
index 000000000000..a27c6b8d4310
--- /dev/null
+++ b/external/librevenge/rpath.patch
@@ -0,0 +1,10 @@
+--- configure
++++ configure
+@@ -14983,6 +14983,7 @@
+ 	    esac
+ 	    ;;
+ 	esac
++hardcode_libdir_flag_spec_CXX=
+ 	;;
+ 
+       lynxos*)