Author: matthew
Date: Fri Mar 29 12:37:50 2013
New Revision: 10230

Log:
Fix Binutils' texinfo file in pass1 and pass2 in case hosts have Texinfo >= 5.1 
installed.

Modified:
   trunk/BOOK/chapter01/changelog.xml
   trunk/BOOK/chapter05/binutils-pass1.xml
   trunk/BOOK/chapter05/binutils-pass2.xml
   trunk/BOOK/chapter06/procps.xml

Modified: trunk/BOOK/chapter01/changelog.xml
==============================================================================
--- trunk/BOOK/chapter01/changelog.xml  Fri Mar 29 04:28:04 2013        (r10229)
+++ trunk/BOOK/chapter01/changelog.xml  Fri Mar 29 12:37:50 2013        (r10230)
@@ -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

Modified: trunk/BOOK/chapter05/binutils-pass1.xml
==============================================================================
--- trunk/BOOK/chapter05/binutils-pass1.xml     Fri Mar 29 04:28:04 2013        
(r10229)
+++ trunk/BOOK/chapter05/binutils-pass1.xml     Fri Mar 29 12:37:50 2013        
(r10230)
@@ -70,6 +70,12 @@
     <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/[email protected]/doc@@cygnus.com/' 
bfd/doc/bfd.texinfo</userinput></screen>
+
     <para>Now prepare Binutils for compilation:</para>
 
 <screen><userinput remap="configure">../binutils-&binutils-version;/configure  
   \

Modified: trunk/BOOK/chapter05/binutils-pass2.xml
==============================================================================
--- trunk/BOOK/chapter05/binutils-pass2.xml     Fri Mar 29 04:28:04 2013        
(r10229)
+++ trunk/BOOK/chapter05/binutils-pass2.xml     Fri Mar 29 12:37:50 2013        
(r10230)
@@ -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/[email protected]/doc@@cygnus.com/' 
bfd/doc/bfd.texinfo</userinput></screen>
+
     <para>Prepare Binutils for compilation:</para>
 
 <screen><userinput remap="configure">CC=$LFS_TGT-gcc            \

Modified: trunk/BOOK/chapter06/procps.xml
==============================================================================
--- trunk/BOOK/chapter06/procps.xml     Fri Mar 29 04:28:04 2013        (r10229)
+++ trunk/BOOK/chapter06/procps.xml     Fri Mar 29 12:37:50 2013        (r10230)
@@ -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
-- 
http://linuxfromscratch.org/mailman/listinfo/lfs-book
FAQ: http://www.linuxfromscratch.org/lfs/faq.html
Unsubscribe: See the above information page

Reply via email to