Kaydet (Commit) 490f07cf authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Extend libtool RPATH outsmarting hack to external/librevenge

(See 1d028d47 "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 ed81fe44 "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: 's avatarStephan Bergmann <sbergman@redhat.com>
üst 80b3338e
......@@ -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, \
......
--- configure
+++ configure
@@ -14983,6 +14983,7 @@
esac
;;
esac
+hardcode_libdir_flag_spec_CXX=
;;
lynxos*)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment