|
 |
f621d0 |
From f7e477ec085414991c8160c7394bfaf2b1425c67 Mon Sep 17 00:00:00 2001
|
|
|
f621d0 |
From: Karsten Hopp <karsten@fedoraproject.org>
|
|
|
f621d0 |
Date: Wed, 29 Oct 2014 13:27:27 +0100
|
|
|
f621d0 |
Subject: [PATCH] remove /lib64 and /usr/lib64 rpath
|
|
|
f621d0 |
|
|
|
f621d0 |
---
|
|
|
f621d0 |
m4/libtool.m4 | 5 ++++-
|
|
|
f621d0 |
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
|
f621d0 |
|
|
|
f621d0 |
diff --git a/m4/libtool.m4 b/m4/libtool.m4
|
|
|
f621d0 |
index f796d7b..41dd20a 100644
|
|
|
f621d0 |
--- a/m4/libtool.m4
|
|
|
f621d0 |
+++ b/m4/libtool.m4
|
|
|
f621d0 |
@@ -2866,6 +2866,9 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
|
|
|
f621d0 |
# before this can be enabled.
|
|
|
f621d0 |
hardcode_into_libs=yes
|
|
|
f621d0 |
|
|
|
f621d0 |
+ # Add ABI-specific directories to the system library path.
|
|
|
f621d0 |
+ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
|
|
|
f621d0 |
+
|
|
|
f621d0 |
# Ideally, we could use ldconfig to report *all* directores which are
|
|
|
f621d0 |
# searched for libraries, however this is still not possible. Aside from not
|
|
|
f621d0 |
# being certain /sbin/ldconfig is available, command
|
|
|
f621d0 |
@@ -2874,7 +2877,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
|
|
|
f621d0 |
# appending ld.so.conf contents (and includes) to the search path.
|
|
|
f621d0 |
if test -f /etc/ld.so.conf; then
|
|
|
f621d0 |
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' ' '`
|
|
|
f621d0 |
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
|
|
|
f621d0 |
+ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
|
|
|
f621d0 |
fi
|
|
|
f621d0 |
|
|
|
f621d0 |
# We used to test for /lib/ld.so.1 and disable shared libraries on
|
|
|
f621d0 |
--
|
|
|
f621d0 |
2.1.0
|
|
|
f621d0 |
|