Re: multilib dirs and ld.so

[Peter O'Gorman]

Proposed patches for branch-1-5 and HEAD.

Okay to apply?

Peter

2007-09-05  Peter O'Gorman  <address@hidden>

        * libtool.m4 (AC_LIBTOOL_SYS_DYNAMIC_LINKER) [linux]: Try to set
        the dynamic linker search path properly for multilib case.

Index: libtool.m4
===================================================================
RCS file: /sources/libtool/libtool/Attic/libtool.m4,v
retrieving revision 1.314.2.187
diff -u -r1.314.2.187 libtool.m4
--- libtool.m4  16 Aug 2007 18:23:24 -0000      1.314.2.187
+++ libtool.m4  5 Sep 2007 05:53:02 -0000
@@ -1622,10 +1622,16 @@
   # before this can be enabled.
   hardcode_into_libs=yes
 
+  echo "int main() { return 0; }" > conftest.c
+  $CC $CFLAGS $LDFLAGS $CPPFLAGS -o conftest conftest.c -lc 2>&1 >/dev/null
+  rm conftest.c
+  libsuff=`ldd conftest 2>/dev/null | awk '/^[[ \t]]*\// {n=split([$]1,x,"/"); 
for (i=0; i < n; i++) { if (x[[i]] == "lib64") {print "64"}}}'`
+  rm conftest
+  sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
   # 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

2007-09-05  Peter O'Gorman  <address@hidden>

        * libltdl/m4/libtool.m4 (_LT_SYS_DYNAMIC_LINKER) [linux]: Try to
        set the dynamic linker search path properly for multilib case.

Index: libltdl/m4/libtool.m4
===================================================================
RCS file: /sources/libtool/libtool/libltdl/m4/libtool.m4,v
retrieving revision 1.117
diff -u -r1.117 libtool.m4
--- libltdl/m4/libtool.m4       29 Aug 2007 20:54:53 -0000      1.117
+++ libltdl/m4/libtool.m4       5 Sep 2007 05:55:38 -0000
@@ -2340,10 +2340,17 @@
   # before this can be enabled.
   hardcode_into_libs=yes
 
+  echo "int main() { return 0; }" > conftest.c
+  $CC $CFLAGS $LDFLAGS $CPPFLAGS -o conftest conftest.c -lc 2>&1 >/dev/null
+  rm conftest.c
+  libsuff=`ldd conftest 2>/dev/null | awk '/^[[ \t]]*\// {n=split([$]1,x,"/"); 
for (i=0; i < n; i++) { if (x[[i]] == "lib64") {print "64"}}}'`
+  rm conftest
+  sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
+
   # 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