From 54d3ed5dbf1cae144b61fd8b9da2b97121de407e Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Fri, 6 Jan 2012 21:43:31 +0000
Subject: Change to simple glibc version check in version-check.sh. Change to
 php script for 'Get Counted'.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9698 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 prologue/hostreqs.xml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'prologue/hostreqs.xml')

diff --git a/prologue/hostreqs.xml b/prologue/hostreqs.xml
index 751bc9525..5961b773a 100644
--- a/prologue/hostreqs.xml
+++ b/prologue/hostreqs.xml
@@ -157,20 +157,23 @@ bash --version | head -n1 | cut -d" " -f2-4
 echo "/bin/sh -&gt; `readlink -f /bin/sh`"
 echo -n "Binutils: "; ld --version | head -n1 | cut -d" " -f3-
 bison --version | head -n1
+
 if [ -e /usr/bin/yacc ];
   then echo "/usr/bin/yacc -&gt; `readlink -f /usr/bin/yacc`"; 
   else echo "yacc not found"; fi
+
 bzip2 --version 2&gt;&amp;1 &lt; /dev/null | head -n1 | cut -d" " -f1,6-
 echo -n "Coreutils: "; chown --version | head -n1 | cut -d")" -f2
 diff --version | head -n1
 find --version | head -n1
 gawk --version | head -n1
+
 if [ -e /usr/bin/awk ];
   then echo "/usr/bin/awk -&gt; `readlink -f /usr/bin/awk`"; 
   else echo "awk not found"; fi
+
 gcc --version | head -n1
-libcLib="`find /lib /lib64 -name libc.so.6 -print`"
-/${libcLib} | head -n1 | cut -d"," -f1
+ldd --version | head -n1 | cut -d" " -f2-  # glibc version
 grep --version | head -n1
 gzip --version | head -n1
 cat /proc/version
@@ -182,9 +185,10 @@ sed --version | head -n1
 tar --version | head -n1
 echo "Texinfo: `makeinfo --version | head -n1`"
 xz --version | head -n1
+
 echo 'main(){}' &gt; dummy.c &amp;&amp; gcc -o dummy dummy.c
-if [ -x dummy ]; then echo "Compilation OK";
-  else echo "Compilation failed"; fi
+if [ -x dummy ]; then echo "gcc compilation OK";
+  else echo "gcc compilation failed"; fi
 rm -f dummy.c dummy
 </literal>
 EOF
-- 
cgit v1.2.3-54-g00ecf