diff options
| -rw-r--r-- | chapter01/changelog.xml | 20 | ||||
| -rw-r--r-- | chapter05/gettext.xml | 1 | ||||
| -rw-r--r-- | general.ent | 6 | ||||
| -rw-r--r-- | packages.ent | 6 | ||||
| -rw-r--r-- | prologue/architecture.xml | 2 | ||||
| -rw-r--r-- | 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 @@ -36,6 +36,26 @@ </listitem> --> <listitem> + <para>2015-01-02</para> + <itemizedlist> + <listitem> + <para>[bdubbs] - Update to man-pages-3.76. Fixes + <ulink url="&lfs-ticket-root;3728">#3728</ulink>.</para> + </listitem> + <listitem> + <para>[bdubbs] - Fix URL for CLFS. Fixes + <ulink url="&lfs-ticket-root;3727">#3727</ulink>.</para> + </listitem> + <listitem> + <para>[bdubbs] - Update copyright year.</para> + </listitem> + <listitem> + <para>[bdubbs] - Make version-check script more robust.</para> + </listitem> + </itemizedlist> + </listitem> + + <listitem> <para>2014-12-25</para> <itemizedlist> <listitem> 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</userinput></screen> <para>Compile the package:</para> <screen><userinput remap="make">make -C gnulib-lib +make -C intl pluralx.c make -C src msgfmt make -C src msgmerge make -C src xgettext</userinput></screen> diff --git a/general.ent b/general.ent index a1ecaaf64..a5abde153 100644 --- a/general.ent +++ b/general.ent @@ -1,7 +1,7 @@ -<!ENTITY version "SVN-20141225"> +<!ENTITY version "SVN-20150102"> <!ENTITY short-version "svn"> <!-- Used in dbus chapter, change to x.y for release --> -<!ENTITY releasedate "December 25, 2014"> -<!ENTITY copyrightdate "1999-2014"><!-- jhalfs needs a literal dash, not – --> +<!ENTITY releasedate "January 2, 2015"> +<!ENTITY copyrightdate "1999-2015"><!-- jhalfs needs a literal dash, not – --> <!ENTITY milestone "7.7"> <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" --> diff --git a/packages.ent b/packages.ent index ba9a57496..134e575d7 100644 --- a/packages.ent +++ b/packages.ent @@ -432,10 +432,10 @@ <!ENTITY man-db-ch6-du "28 MB"> <!ENTITY man-db-ch6-sbu "0.5 SBU"> -<!ENTITY man-pages-version "3.75"> -<!ENTITY man-pages-size "1,264 KB"> +<!ENTITY man-pages-version "3.76"> +<!ENTITY man-pages-size "1,271 KB"> <!ENTITY man-pages-url "&kernel;linux/docs/man-pages/man-pages-&man-pages-version;.tar.xz"> -<!ENTITY man-pages-md5 "2497a812b5bd0160169a8042181005aa"> +<!ENTITY man-pages-md5 "c2c0ff8bebf00054089dcb43787135b6"> <!ENTITY man-pages-home "http://www.kernel.org/doc/man-pages/"> <!ENTITY man-pages-ch6-du "24 MB"> <!ENTITY man-pages-ch6-sbu "less than 0.1 SBU"> 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.</para> 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 <ulink url="http://trac.cross-lfs.org/">Cross Linux From Scratch</ulink> +the <ulink url="http://trac.clfs.org/">Cross Linux From Scratch</ulink> project for this advanced topic.</para> <para>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</literal> -<!-- -for lib in lib{gmp,mpfr,mpc}.la; do - echo $lib: $(if find /usr/lib* -name $lib| - grep -q $lib;then :;else echo not;fi) found -done -unset lib</literal>--> EOF bash version-check.sh</userinput></screen> |