summaryrefslogtreecommitdiffstats
path: root/libtool-2.2.6a-rpath.patch
blob: defa6b2134fa097c8900409ce6a8716d9c2af542 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
diff -up libtool-2.2.6/libltdl/m4/libtool.m4.rpath libtool-2.2.6/libltdl/m4/libtool.m4
--- libtool-2.2.6/libltdl/m4/libtool.m4.rpath	2008-09-05 07:54:41.000000000 -0400
+++ libtool-2.2.6/libltdl/m4/libtool.m4	2009-02-18 06:56:47.000000000 -0500
@@ -2470,10 +2470,13 @@ linux* | k*bsd*-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;/^$/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