* libtool.m4 (AC_LIBTOOL_SYS_DYNAMIC_LINKER) [linux]:

Ignore lines in ld.so.conf starting with 'hwcap '.

diff --git a/ChangeLog b/ChangeLog
index b4e8dc49607a6a3ee59e099e03278300ed074603..16c52fc9c860184659de61386da5b4764efd2ac7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-22  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * libtool.m4 (AC_LIBTOOL_SYS_DYNAMIC_LINKER) [linux]:
+       Ignore lines in ld.so.conf starting with 'hwcap '.
+
 2007-06-22  Peter O'Gorman  <peter@pogma.com>
 
        * ltmain.in (version-number) [irix]: Don't subtract 1 from

diff --git a/libtool.m4 b/libtool.m4
index 7b41fef7b03e46cff9024c0a32656718c29b3bdb..e5292dafb823b8f40d993c9dfd6a0f95bb8b6f05 100644 (file)
--- a/libtool.m4
+++ b/libtool.m4
@@ -1620,7 +1620,7 @@ linux* | k*bsd*-gnu)
 
   # 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/#.*//;s/[:,       ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    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"
   fi