patches/libtool-1.5.24-multilib.patch

   1 --- libtool-1.5.24_patched/libtool.m4.multilib  2007-07-10 14:39:32.000000000 +0200
   2 +++ libtool-1.5.24_patched/libtool.m4   2007-07-10 14:48:00.000000000 +0200
   3 @@ -559,6 +559,7 @@ s390*-*linux*|sparc*-*linux*)
   4        esac
   5        ;;
   6      *64-bit*)
   7 +      libsuff=64
   8        case $host in
   9          x86_64-*kfreebsd*-gnu)
  10            LD="${LD-ld} -m elf_x86_64_fbsd"
  11 @@ -1617,11 +1618,13 @@ linux* | k*bsd*-gnu)
  12    # Some rework will be needed to allow for fast_install
  13    # before this can be enabled.
  14    hardcode_into_libs=yes
  15 +  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
  16 +  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
  17
  18    # Append ld.so.conf contents to the search path
  19    if test -f /etc/ld.so.conf; then
  20      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' ' '`
  21 -    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
  22 +    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
  23    fi
  24
  25    # We used to test for /lib/ld.so.1 and disable shared libraries on