From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Sun, 17 Sep 2006 19:27:14 +0000 (+0000)
Subject: * libltdl/m4/libtool.m4 (_LT_SYS_DYNAMIC_LINKER) [ linux ]
X-Git-Tag: release-2-1b~245
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a47ab0fc668e3288aacdeeff59f52ea8802c38d2;p=thirdparty%2Flibtool.git

* libltdl/m4/libtool.m4 (_LT_SYS_DYNAMIC_LINKER) [ linux ]
[ k*bsd*-gnu ]: Test if ld sets DT_RUNPATH; in that case, set
shlib_overrides_runpath to `yes'.  Fixes test failure of new
test on Gentoo GNU/Linux.
---

diff --git a/ChangeLog b/ChangeLog
index d43d00210..397f76870 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2006-09-17  Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
 
+	* libltdl/m4/libtool.m4 (_LT_SYS_DYNAMIC_LINKER) [ linux ]
+	[ k*bsd*-gnu ]: Test if ld sets DT_RUNPATH; in that case, set
+	shlib_overrides_runpath to `yes'.  Fixes test failure of new
+	test on Gentoo GNU/Linux.
+
 	* tests/shlibpath.at: New file, with...
 	(shlibpath_overrides_runpath): ...new test.
 	* Makefile.am: Update.
diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4
index 50dea3683..0e49f0a4a 100644
--- a/libltdl/m4/libtool.m4
+++ b/libltdl/m4/libtool.m4
@@ -2275,6 +2275,15 @@ linux* | k*bsd*-gnu)
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
+  # Some binutils ld are patched to set DT_RUNPATH 
+  save_LDFLAGS=$LDFLAGS
+  libdir=/foo wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) \
+  eval LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"
+  AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+    [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir"],
+       [shlibpath_overrides_runpath=yes])])
+  LDFLAGS=$save_LDFLAGS
+
   # This implies no fast_install, which is unacceptable.
   # Some rework will be needed to allow for fast_install
   # before this can be enabled.