Annotation of /trunk/libtool/patches/libtool-1.5.22-multilib.patch
Parent Directory | Revision Log
Revision 144 -
(hide annotations)
(download)
Tue May 8 20:06:05 2007 UTC (17 years, 1 month ago) by niro
File size: 1459 byte(s)
Tue May 8 20:06:05 2007 UTC (17 years, 1 month ago) by niro
File size: 1459 byte(s)
-import
1 | niro | 144 | --- libtool-1.5.22/libtool.m4.multilib 2005-12-18 22:53:17.000000000 +0100 |
2 | +++ libtool-1.5.22/libtool.m4 2006-06-08 11:12:46.000000000 +0200 | ||
3 | @@ -1572,10 +1572,27 @@ | ||
4 | # before this can be enabled. | ||
5 | hardcode_into_libs=yes | ||
6 | |||
7 | + # find out which ABI we are using | ||
8 | + libsuff= | ||
9 | + case "$host_cpu" in | ||
10 | + x86_64*|s390x*|powerpc64*) | ||
11 | + echo '[#]line __oline__ "configure"' > conftest.$ac_ext | ||
12 | + if AC_TRY_EVAL(ac_compile); then | ||
13 | + case `/usr/bin/file conftest.$ac_objext` in | ||
14 | + *64-bit*) | ||
15 | + libsuff=64 | ||
16 | + sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" | ||
17 | + ;; | ||
18 | + esac | ||
19 | + fi | ||
20 | + rm -rf conftest* | ||
21 | + ;; | ||
22 | + esac | ||
23 | + | ||
24 | # Append ld.so.conf contents to the search path | ||
25 | if test -f /etc/ld.so.conf; then | ||
26 | - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` | ||
27 | - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" | ||
28 | + 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/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` | ||
29 | + sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" | ||
30 | fi | ||
31 | |||
32 | # We used to test for /lib/ld.so.1 and disable shared libraries on |