* libltdl/m4/libtool.m4 (_LT_SYS_DYNAMIC_LINKER) [linux]:

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

diff --git a/ChangeLog b/ChangeLog
index 4c07f490a5d4c81e5fe07a2515d65eff0fa4b2ee..917c4fb13e258ee62de7437e3b10c3b546ad399a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-22  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * libltdl/m4/libtool.m4 (_LT_SYS_DYNAMIC_LINKER) [linux]:
+       Ignore lines in ld.so.conf starting with 'hwcap '.
+
 2007-07-16  Charles Wilson  <libtool@cwilson.fastmail.fm>
 
        * tests/cdemo-exec.test: use $EXEEXT where appropriate

diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4
index a15a2bd73382d7f575a06dd0e1362f6ea6f87fae..e9355bbf4cbe39f13ab242a6506dc6c18674e7f6 100644 (file)
--- a/libltdl/m4/libtool.m4
+++ b/libltdl/m4/libtool.m4
@@ -2342,7 +2342,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