From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Sun, 24 Jun 2007 02:13:30 +0000 (+0000)
Subject: * libtool.m4 (AC_LIBTOOL_SYS_DYNAMIC_LINKER) [linux]:
X-Git-Tag: release-1-5-24~1
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=47cbece3c28dad089648c7bf34a6e86369d16306;p=thirdparty%2Flibtool.git

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

diff --git a/ChangeLog b/ChangeLog
index b4e8dc496..16c52fc9c 100644
--- 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 7b41fef7b..e5292dafb 100644
--- 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