Kaydet (Commit) 24d0704f authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Fix external/libassuan Linux RPATH

In other external projects using libtool, we fix that by patching configure,
resetting hardcode_libdir_flag_spec[_CXX] at the end of the linux*) case block
that sets the Linux-specific value.  But here we run autoreconf in
ExternalProject_libassuan, so that patch in configure would be overwritten.  The
relevant code in configure comes from autoconf boilerplate, so we cannot just do
the same patch in configure.ac.  But we can reset hardcode_libdir_flag_spec
sufficiently late in configure.ac so that things still work as intended.

Change-Id: Ic6c6123bcfe8bc2dac87812f919842519374abaa
Reviewed-on: https://gerrit.libreoffice.org/50959Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarStephan Bergmann <sbergman@redhat.com>
üst 4cb1f0a5
......@@ -231,7 +231,7 @@ else
if [ -s check_elf.out ] ; then
cat check_elf.out
# FIXME known broken, ignore for now
if grep -v 'libgpgmepp.so.6\|libgpgme.so.11\|libassuan.so.0' check_elf.out >/dev/null; then
if grep -v 'libgpgmepp.so.6\|libgpgme.so.11' check_elf.out >/dev/null; then
status=1
fi
fi
......
......@@ -18,6 +18,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libassuan, \
external/libassuan/fix-autoconf-macros.patch \
$(if $(filter MSC,$(COM)),external/libassuan/w32-build-fixes.patch.1) \
external/libassuan/w32-build-fixes-2.patch \
$(if $(filter LINUX,$(OS)),external/libassuan/rpath.patch) \
))
# vim: set noet sw=4 ts=4:
--- configure.ac
+++ configure.ac
@@ -127,6 +127,8 @@
LT_INIT([win32-dll disable-static])
LT_LANG([Windows Resource])
+hardcode_libdir_flag_spec=
+
# For now we hardcode the use of version scripts. It would be better
# to write a test for this or even implement this within libtool.
have_ld_version_script=no
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