aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chapter01/changelog.xml5
-rw-r--r--chapter05/binutils-pass1.xml6
-rw-r--r--chapter05/binutils-pass2.xml6
-rw-r--r--chapter06/procps.xml7
4 files changed, 20 insertions, 4 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index a906b3b48..dd2959e86 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -40,6 +40,11 @@
<para>2013-03-29</para>
<itemizedlist>
<listitem>
+ <para>[matthew] - Add texinfo related seds to Binutils pass1 and pass2
+ as hosts may have a new enough version of Texinfo to cause
+ issues.</para>
+ </listitem>
+ <listitem>
<para>[matthew] - Use --disable-install-libiberty to prevent GCC from
installing libiberty.a (thanks to Armin K. for the pointer). Retain
the existing sed, though, as the flag doesn't work correctly
diff --git a/chapter05/binutils-pass1.xml b/chapter05/binutils-pass1.xml
index decec8b6f..e30f3962e 100644
--- a/chapter05/binutils-pass1.xml
+++ b/chapter05/binutils-pass1.xml
@@ -70,6 +70,12 @@ cd ../binutils-build</userinput></screen>
<note><para>The approximate build SBU values and required disk space
in Chapter 5 does not include test suite data.</para></note>
+ <para>Fix a couple of syntax errors that prevent the documentation from
+ building with Texinfo-&texinfo-version;:</para>
+
+<screen><userinput remap="pre">sed -i -e 's/@colophon/@@colophon/' \
+ -e 's/doc@cygnus.com/doc@@cygnus.com/' bfd/doc/bfd.texinfo</userinput></screen>
+
<para>Now prepare Binutils for compilation:</para>
<screen><userinput remap="configure">../binutils-&binutils-version;/configure \
diff --git a/chapter05/binutils-pass2.xml b/chapter05/binutils-pass2.xml
index 1cac61a18..7c99eac5f 100644
--- a/chapter05/binutils-pass2.xml
+++ b/chapter05/binutils-pass2.xml
@@ -48,6 +48,12 @@
<screen><userinput remap="pre">mkdir -v ../binutils-build
cd ../binutils-build</userinput></screen>
+ <para>Fix a couple of syntax errors that prevent the documentation from
+ building with Texinfo-&texinfo-version;:</para>
+
+<screen><userinput remap="pre">sed -i -e 's/@colophon/@@colophon/' \
+ -e 's/doc@cygnus.com/doc@@cygnus.com/' bfd/doc/bfd.texinfo</userinput></screen>
+
<para>Prepare Binutils for compilation:</para>
<screen><userinput remap="configure">CC=$LFS_TGT-gcc \
diff --git a/chapter06/procps.xml b/chapter06/procps.xml
index 7a63f7755..217722a78 100644
--- a/chapter06/procps.xml
+++ b/chapter06/procps.xml
@@ -74,10 +74,9 @@
<screen><userinput remap="make">make</userinput></screen>
<para>The test suite needs some custom modifications for LFS.
- The <command>which</command> command is not available, the
- <command>pmap</command> test does not match a newline character in
- two tests, and the <command>slabtop</command> test may return more than
- 999,999 objects. To run the test suite, run the following commands:</para>
+ The <command>which</command> command is not available, and the
+ <command>slabtop</command> test may return more than 999,999 objects. To run
+ the test suite, run the following commands:</para>
<screen><userinput remap="test">sed -i -e 's|exec which sleep|exec echo /tools/bin/sleep|' \
-e 's|&amp;9|9999999|' testsuite/config/unix.exp