From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Sun, 17 Sep 2006 19:30:15 +0000 (+0000)
Subject: * libltdl/m4/libtool.m4 (_LT_LINKER_SHLIBS, _LT_LANG_CXX_CONFIG)
X-Git-Tag: release-2-1b~244
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f951c011fc47099ad75aaff96af58286ee49bc1;p=thirdparty%2Flibtool.git

* libltdl/m4/libtool.m4 (_LT_LINKER_SHLIBS, _LT_LANG_CXX_CONFIG)
[ openbsd ]: Set `hardcode_direct_absolute', to prefer rpath
over putting absolute file names in NEEDED entries.
* NEWS: Update.
Reported by Jake Meuser and others.
---

diff --git a/ChangeLog b/ChangeLog
index 397f76870..31ae28db7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2006-09-17  Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
 
+	* libltdl/m4/libtool.m4 (_LT_LINKER_SHLIBS, _LT_LANG_CXX_CONFIG)
+	[ openbsd ]: Set `hardcode_direct_absolute', to prefer rpath
+	over putting absolute file names in NEEDED entries.
+	* NEWS: Update.
+	Reported by Jake Meuser and others.
+
 	* 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
diff --git a/NEWS b/NEWS
index b1a5203c7..098bcef07 100644
--- a/NEWS
+++ b/NEWS
@@ -67,6 +67,8 @@ New in 1.9d: 2004-10-03; CVS version 1.9c, Libtool team:
 * Improved support for linux-gnu/ia64.
 * Initial support for s390x-ibm-tpf.
 * Fixed some memory leaks in libltdl.
+* Improved support for OpenBSD (use rpath instead of hardcoding absolute
+  file names).
 
 New in 1.9b: 2004-08-29; CVS version 1.5a, Libtool team:
 * The /^_?LT_[A-Z_]+$/ namespace is now reserved for Libtool's own macros.
diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4
index 0e49f0a4a..f35d14d50 100644
--- a/libltdl/m4/libtool.m4
+++ b/libltdl/m4/libtool.m4
@@ -4668,6 +4668,7 @@ _LT_EOF
     openbsd*)
       _LT_TAGVAR(hardcode_direct, $1)=yes
       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
       if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
 	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
 	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
@@ -5874,6 +5875,7 @@ if test "$_lt_caught_CXX_error" != yes; then
       openbsd*)
 	_LT_TAGVAR(hardcode_direct, $1)=yes
 	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
 	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
 	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
 	if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then