Re: hwcap 0 nosegneg in FC6 ld.so.cache

[Ralf Wildenhues]

Hi Peter,

* Peter O'Gorman wrote on Sun, Jun 24, 2007 at 04:13:38AM CEST:
> 
> Hi Ralf,
> I applied this.

And I ported this to HEAD now.  This prevents HEAD from regressing
over branch-1-5.  Olly's solution should not be forgotten, though.

Cheers,
Ralf

2007-07-22  Ralf Wildenhues  <address@hidden>

        * libltdl/m4/libtool.m4 (_LT_SYS_DYNAMIC_LINKER) [linux]:
        Ignore lines in ld.so.conf starting with 'hwcap '.

Index: libltdl/m4/libtool.m4
===================================================================
RCS file: /cvsroot/libtool/libtool/libltdl/m4/libtool.m4,v
retrieving revision 1.111
diff -u -r1.111 libtool.m4
--- libltdl/m4/libtool.m4       3 Jul 2007 05:09:40 -0000       1.111
+++ libltdl/m4/libtool.m4       22 Jul 2007 08:51:40 -0000
@@ -2342,7 +2342,7 @@
 
   # 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