diff options
| author | Pavel Raiskup <praiskup@redhat.com> | 2014-10-29 13:54:10 +0100 |
|---|---|---|
| committer | Pavel Raiskup <praiskup@redhat.com> | 2015-01-14 08:15:03 +0100 |
| commit | f6d9cfe433010677e31bdcd86a15abc3b962e7f0 (patch) | |
| tree | 932c4f303d30b2d961e1b6a18e987a460841e2a1 /libtool-2.4.3-rpath.patch | |
| parent | f5393b6f955c97062e994c2f1bc2fe9bc73d4a99 (diff) | |
| download | libtool-f6d9cfe433010677e31bdcd86a15abc3b962e7f0.tar.gz libtool-f6d9cfe433010677e31bdcd86a15abc3b962e7f0.tar.xz libtool-f6d9cfe433010677e31bdcd86a15abc3b962e7f0.zip | |
rebase to latest minor (bugfix) release
Per release notes:
http://lists.gnu.org/archive/html/autotools-announce/2014-10/msg00000.html
Resolves: #1159497
Version: 2.4.3-1
Diffstat (limited to 'libtool-2.4.3-rpath.patch')
| -rw-r--r-- | libtool-2.4.3-rpath.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/libtool-2.4.3-rpath.patch b/libtool-2.4.3-rpath.patch new file mode 100644 index 0000000..30dd5f9 --- /dev/null +++ b/libtool-2.4.3-rpath.patch @@ -0,0 +1,31 @@ +From 78f1c485fa9833c2b02f0bb5b1a630ee67251a01 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 068f0d8..bb87360 100644 +--- a/m4/libtool.m4 ++++ b/m4/libtool.m4 +@@ -2739,10 +2739,13 @@ 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" ++ + # Append ld.so.conf contents 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 +-- +1.9.3 + |