summaryrefslogtreecommitdiff
path: root/bin/check-elf-dynamic-objects
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2018-03-08 15:40:20 +0100
committerStephan Bergmann <sbergman@redhat.com>2018-03-08 18:08:14 +0100
commit24d0704fa468b300558a3f904ae853fcb7fca312 (patch)
treeff239f45ea8fca05a0bc81dc0a929cc45ac18ce4 /bin/check-elf-dynamic-objects
parent4cb1f0a5ff1c3e74c650f17d9a164e97c34e9327 (diff)
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 <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'bin/check-elf-dynamic-objects')
-rwxr-xr-xbin/check-elf-dynamic-objects2
1 files changed, 1 insertions, 1 deletions
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