From 24d0704fa468b300558a3f904ae853fcb7fca312 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 8 Mar 2018 15:40:20 +0100 Subject: 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/50959 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- bin/check-elf-dynamic-objects | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bin') diff --git a/bin/check-elf-dynamic-objects b/bin/check-elf-dynamic-objects index 62fe040dc01a..4e3a4fccec44 100755 --- a/bin/check-elf-dynamic-objects +++ b/bin/check-elf-dynamic-objects @@ -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 -- cgit v1.2.3