libtool: Import patch to avoid unnecessary RPATHs

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/libtool/libtool.nm b/libtool/libtool.nm
index 4d4cd82f7653db161d8868d9edf97558ecf140e1..4467fbf4bd6380f4c6dc43e10e47361e39602bcf 100644 (file)
--- a/libtool/libtool.nm
+++ b/libtool/libtool.nm
@@ -5,7 +5,7 @@
 
 name       = libtool
 version    = 2.4.6
-release    = 1
+release    = 2
 
 groups     = System/Libraries
 url        = http://www.gnu.org/software/libtool/
@@ -24,12 +24,12 @@ sources    = %{thisapp}.tar.gz
 
 build
        requires
+               autoconf
+               automake
                m4
        end
 end
 
-
-
 packages
        package %{name}
                groups += Build

diff --git a/libtool/patches/libtool-2.4.5-rpath.patch b/libtool/patches/libtool-2.4.5-rpath.patch
new file mode 100644 (file)
index 0000000..2f97997
--- /dev/null
+++ b/libtool/patches/libtool-2.4.5-rpath.patch
@@ -0,0 +1,35 @@
+From f7e477ec085414991c8160c7394bfaf2b1425c67 Mon Sep 17 00:00:00 2001
+From: Karsten Hopp <karsten@fedoraproject.org>
+Date: Wed, 29 Oct 2014 13:27:27 +0100
+Subject: [PATCH] remove /lib64 and /usr/lib64 rpath
+
+---
+ m4/libtool.m4 | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/m4/libtool.m4 b/m4/libtool.m4
+index f796d7b..41dd20a 100644
+--- a/m4/libtool.m4
++++ b/m4/libtool.m4
+@@ -2866,6 +2866,9 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+   # before this can be enabled.
+   hardcode_into_libs=yes
+ 
++  # Add ABI-specific directories to the system library path.
++  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
++
+   # Ideally, we could use ldconfig to report *all* directores which are
+   # searched for libraries, however this is still not possible.  Aside from not
+   # being certain /sbin/ldconfig is available, command
+@@ -2874,7 +2877,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+   # appending ld.so.conf contents (and includes) to the search path.
+   if test -f /etc/ld.so.conf; then
+     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[         ]*hwcap[        ]/d;s/[:,      ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
+-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
+   fi
+ 
+   # We used to test for /lib/ld.so.1 and disable shared libraries on
+-- 
+2.1.0
+