diff options
| author | Pavel Raiskup <praiskup@redhat.com> | 2015-01-20 09:03:50 +0100 |
|---|---|---|
| committer | Pavel Raiskup <praiskup@redhat.com> | 2015-02-17 14:05:53 +0100 |
| commit | ee981597d80663c731b464a1b0a6f39d530c9d92 (patch) | |
| tree | cb4605adcf8ba7a63395d61fbdb1a86a8a058009 /libtool-2.4.5-rpath.patch | |
| parent | 1421f339b71ac3b739c91253360ff7be1a7b8a15 (diff) | |
| download | libtool-ee981597d80663c731b464a1b0a6f39d530c9d92.tar.gz libtool-ee981597d80663c731b464a1b0a6f39d530c9d92.tar.xz libtool-ee981597d80663c731b464a1b0a6f39d530c9d92.zip | |
libtool: rebase to 2.4.5
Per upstream release notes:
http://lists.gnu.org/archive/html/autotools-announce/2015-01/msg00001.html
Resolves: #1159497
Version: 2.4.5-1
Diffstat (limited to 'libtool-2.4.5-rpath.patch')
| -rw-r--r-- | libtool-2.4.5-rpath.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/libtool-2.4.5-rpath.patch b/libtool-2.4.5-rpath.patch new file mode 100644 index 0000000..2f97997 --- /dev/null +++ b/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 + |