This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPC library used by GnuPG".
The branch, master has been updated
via 23bf875954329458c0ac6c31e253cba44db8a648 (commit)
from 1f038e94e19d2bf165f32eb226416377f96c1ebf (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 23bf875954329458c0ac6c31e253cba44db8a648
Author: NIIBE Yutaka <gniibe at fsij.org>
Date: Wed Jan 16 11:09:33 2019 +0900
build: With LD_LIBRARY_PATH defined, use --disable-new-dtags.
* configure.ac (LDADD_FOR_TESTS_KLUDGE): New for --disable-new-dtags.
* tests/Makefile.am (LDADD): Use LDADD_FOR_TESTS_KLUDGE.
--
GnuPG-bug-id: 4298
Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>
diff --git a/configure.ac b/configure.ac
index 1298eb1..53a4ac6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -85,6 +85,41 @@ AB_INIT
AC_GNU_SOURCE
+# Taken from mpfr-4.0.1, then modified for LDADD_FOR_TESTS_KLUDGE
+dnl Under Linux, make sure that the old dtags are used if LD_LIBRARY_PATH
+dnl is defined. The issue is that with the new dtags, LD_LIBRARY_PATH has
+dnl the precedence over the run path, so that if a compatible MPFR library
+dnl is installed in some directory from $LD_LIBRARY_PATH, then the tested
+dnl MPFR library will be this library instead of the MPFR library from the
+dnl build tree. Other OS with the same issue might be added later.
+dnl
+dnl References:
+dnl https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=859732
+dnl http://lists.gnu.org/archive/html/libtool/2017-05/msg00000.html
+dnl
+dnl We need to check whether --disable-new-dtags is supported as alternate
+dnl linkers may be used (e.g., with tcc: CC=tcc LD=tcc).
+dnl
+case $host in
+ *-*-linux*)
+ if test -n "$LD_LIBRARY_PATH"; then
+ saved_LDFLAGS="$LDFLAGS"
+ LDADD_FOR_TESTS_KLUDGE="-Wl,--disable-new-dtags"
+ LDFLAGS="$LDFLAGS $LDADD_FOR_TESTS_KLUDGE"
+ AC_MSG_CHECKING(whether --disable-new-dtags is supported by the linker)
+ AC_LINK_IFELSE([AC_LANG_SOURCE([[
+int main (void) { return 0; }
+ ]])],
+ [AC_MSG_RESULT(yes (use it since LD_LIBRARY_PATH is set))],
+ [AC_MSG_RESULT(no)
+ LDADD_FOR_TESTS_KLUDGE=""
+ ])
+ LDFLAGS="$saved_LDFLAGS"
+ fi
+ ;;
+esac
+AC_SUBST([LDADD_FOR_TESTS_KLUDGE])
+
VERSION_NUMBER=m4_esyscmd(printf "0x%02x%02x%02x" mym4_major \
mym4_minor mym4_micro)
AC_SUBST(VERSION_NUMBER)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 7712a89..85c2d82 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -47,5 +47,6 @@ AM_LDFLAGS = -no-install
noinst_HEADERS = common.h
noinst_PROGRAMS = $(TESTS) $(w32cetools) $(testtools)
-LDADD = ../src/libassuan.la $(NETLIBS) $(GPG_ERROR_LIBS)
+LDADD = ../src/libassuan.la $(NETLIBS) $(GPG_ERROR_LIBS) \
+ @LDADD_FOR_TESTS_KLUDGE@
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 35 +++++++++++++++++++++++++++++++++++
tests/Makefile.am | 3 ++-
2 files changed, 37 insertions(+), 1 deletion(-)
hooks/post-receive
--
IPC library used by GnuPG
http://git.gnupg.org