From a02b8ef8ce20914e071d864cfb0c78c63854ec10 Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Fri, 2 Jan 2015 18:31:11 +0000 Subject: [PATCH] Update to man-pages-3.76. Fix URL for CLFS. Update copyright year. Make version-check script more robust. git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10811 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- chapter01/changelog.xml | 20 ++++++++++++++++++++ chapter05/gettext.xml | 1 + general.ent | 6 +++--- packages.ent | 6 +++--- prologue/architecture.xml | 2 +- prologue/hostreqs.xml | 28 ++++++++++++++++------------ 6 files changed, 44 insertions(+), 19 deletions(-) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 24e4173dd..96b8eb938 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -35,6 +35,26 @@ --> + + 2015-01-02 + + + [bdubbs] - Update to man-pages-3.76. Fixes + #3728. + + + [bdubbs] - Fix URL for CLFS. Fixes + #3727. + + + [bdubbs] - Update copyright year. + + + [bdubbs] - Make version-check script more robust. + + + + 2014-12-25 diff --git a/chapter05/gettext.xml b/chapter05/gettext.xml index 58170e1f6..c88c0f468 100644 --- a/chapter05/gettext.xml +++ b/chapter05/gettext.xml @@ -76,6 +76,7 @@ EMACS="no" ./configure --prefix=/tools --disable-shared Compile the package: make -C gnulib-lib +make -C intl pluralx.c make -C src msgfmt make -C src msgmerge make -C src xgettext diff --git a/general.ent b/general.ent index a1ecaaf64..a5abde153 100644 --- a/general.ent +++ b/general.ent @@ -1,7 +1,7 @@ - + - - + + diff --git a/packages.ent b/packages.ent index ba9a57496..134e575d7 100644 --- a/packages.ent +++ b/packages.ent @@ -432,10 +432,10 @@ - - + + - + diff --git a/prologue/architecture.xml b/prologue/architecture.xml index af08bc054..84bcc3bb7 100644 --- a/prologue/architecture.xml +++ b/prologue/architecture.xml @@ -41,7 +41,7 @@ data that exceeds 4GB, the advantages of a 64-bit system are substantial. 32-bit system and once for a 64-bit system. This is not directly supported in LFS because it would interfere with the educational objective of providing the instructions needed for a straightforward base Linux system. You can refer to -the Cross Linux From Scratch +the Cross Linux From Scratch project for this advanced topic. There is one last comment about 64-bit systems. There are some older diff --git a/prologue/hostreqs.xml b/prologue/hostreqs.xml index 1ce491d66..3733ae5ad 100644 --- a/prologue/hostreqs.xml +++ b/prologue/hostreqs.xml @@ -163,18 +163,28 @@ bash --version | head -n1 | cut -d" " -f2-4 echo "/bin/sh -> `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 -> `readlink -f /usr/bin/yacc`"; - else echo "yacc not found"; fi + +if [ -h /usr/bin/yacc ]; then + echo "/usr/bin/yacc -> `readlink -f /usr/bin/yacc`"; +elif [ -x /usr/bin/yacc ]; then + echo yacc is `/usr/bin/yacc --version | head -n1` +else + echo "yacc not found" +fi bzip2 --version 2>&1 < /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 -> `readlink -f /usr/bin/awk`"; - else echo "awk not found"; fi + +if [ -h /usr/bin/awk ]; then + echo "/usr/bin/awk -> `readlink -f /usr/bin/awk`"; +elif [ -x /usr/bin/awk ]; then + echo yacc is `/usr/bin/awk --version | head -n1` +else + echo "awk not found" +fi gcc --version | head -n1 g++ --version | head -n1 @@ -195,12 +205,6 @@ if [ -x dummy ] then echo "g++ compilation OK"; else echo "g++ compilation failed"; fi rm -f dummy.c dummy - EOF bash version-check.sh