From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Sun, 22 Jul 2007 08:55:11 +0000 (+0000)
Subject: * libltdl/m4/libtool.m4 (_LT_SYS_DYNAMIC_LINKER) [linux]:
X-Git-Tag: release-2-1b~96
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b3251f4d7e86d0bd4901de62cd9bcd18ddd7965a;p=thirdparty%2Flibtool.git

* 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 4c07f490a..917c4fb13 100644
--- 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 a15a2bd73..e9355bbf4 100644
--- 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