You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
35 lines
1.5 KiB
35 lines
1.5 KiB
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 |
|
|
|
|