r1080 - in trunk/BOOK: final-system/common final-system/multilib temp-system/common testsuite-tools/common

chris at linuxfromscratch.org chris at linuxfromscratch.org
Sun Jan 15 10:06:37 PST 2006


Author: chris
Date: 2006-01-15 11:06:36 -0700 (Sun, 15 Jan 2006)
New Revision: 1080

Modified:
   trunk/BOOK/final-system/common/temp-perl.xml
   trunk/BOOK/final-system/multilib/temp-perl.xml
   trunk/BOOK/temp-system/common/bash.xml
   trunk/BOOK/temp-system/common/texinfo.xml
   trunk/BOOK/testsuite-tools/common/tcl.xml
Log:
Various minor text fixes, and a correction to the temp-perl installation instructions

Modified: trunk/BOOK/final-system/common/temp-perl.xml
===================================================================
--- trunk/BOOK/final-system/common/temp-perl.xml	2006-01-15 12:21:38 UTC (rev 1079)
+++ trunk/BOOK/final-system/common/temp-perl.xml	2006-01-15 18:06:36 UTC (rev 1080)
@@ -27,9 +27,13 @@
 
 <screen os="b"><userinput>patch -Np1 -i ../&perl-libc-patch;</userinput></screen>
 
-<screen os="c"><userinput>./configure.gnu --prefix=/tools -Dstatic_ext='Data/Dumper IO Fcntl POSIX' -Dcc="gcc"</userinput></screen>
+<para os="c">Prepare Perl for compilation (make sure to get the 'Data/Dumper
+Fcntl IO POSIX' part of the command correct—they are all
+letters):</para>
 
-    <variablelist os="d">
+<screen os="d"><userinput>./configure.gnu --prefix=/tools -Dstatic_ext='Data/Dumper IO Fcntl POSIX' -Dcc="gcc"</userinput></screen>
+
+    <variablelist os="e">
       <title>The meaning of the configure option:</title>
 
       <varlistentry>
@@ -37,19 +41,19 @@
         <listitem>
           <para>This tells Perl to build the minimum set of static
           extensions needed for installing and testing the Coreutils
-          package in the next chapter.</para>
+          package later in this chapter.</para>
         </listitem>
       </varlistentry>
 
     </variablelist>
 
-  <para os="e">Now we are ready to make our perl utilities:</para>
+  <para os="f">Now we are ready to make our perl utilities:</para>
 
-<screen os="f"><userinput>make perl utilities</userinput></screen>
+<screen os="g"><userinput>make perl utilities</userinput></screen>
 
-    <para os="g">Install these tools and their libraries:</para>
+    <para os="h">Install these tools and their libraries:</para>
 
-<screen os="h"><userinput>cp perl pod/pod2man /tools/bin
+<screen os="i"><userinput>cp perl pod/pod2man /tools/bin
 install -d /tools/lib/perl5/&perl-version;
 cp -R lib/* /tools/lib/perl5/&perl-version;</userinput></screen>
 

Modified: trunk/BOOK/final-system/multilib/temp-perl.xml
===================================================================
--- trunk/BOOK/final-system/multilib/temp-perl.xml	2006-01-15 12:21:38 UTC (rev 1079)
+++ trunk/BOOK/final-system/multilib/temp-perl.xml	2006-01-15 18:06:36 UTC (rev 1080)
@@ -30,14 +30,14 @@
     href="../common/temp-perl.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/temp-perl.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
 <screen os="c"><userinput>./configure.gnu --prefix=/tools -Dstatic_ext='Data/Dumper IO Fcntl POSIX' -Dcc="gcc ${BUILD32}"</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/temp-perl.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/temp-perl.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -52,6 +52,10 @@
     href="../common/temp-perl.xml"
     xpointer="xpointer(//*[@os='h'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/temp-perl.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
   </sect2>
 
   <sect2 role="content">

Modified: trunk/BOOK/temp-system/common/bash.xml
===================================================================
--- trunk/BOOK/temp-system/common/bash.xml	2006-01-15 12:21:38 UTC (rev 1079)
+++ trunk/BOOK/temp-system/common/bash.xml	2006-01-15 18:06:36 UTC (rev 1080)
@@ -54,7 +54,7 @@
         <listitem>
           <para>This option turns off the use of Bash's memory allocation
           (malloc) function which is known to cause segmentation faults.
-          By turning this option off, Bash will use the malloc function
+          By turning this option off, Bash will use the malloc functions
           from Glibc which are more stable.</para>
         </listitem>
       </varlistentry>

Modified: trunk/BOOK/temp-system/common/texinfo.xml
===================================================================
--- trunk/BOOK/temp-system/common/texinfo.xml	2006-01-15 12:21:38 UTC (rev 1079)
+++ trunk/BOOK/temp-system/common/texinfo.xml	2006-01-15 18:06:36 UTC (rev 1080)
@@ -27,7 +27,7 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
 <screen os="b"><userinput>CC="${CC}" ./configure --prefix=/tools \
-   --host=${LFS_TARGET} </userinput></screen>
+   --host=${LFS_TARGET}</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/texinfo.xml"

Modified: trunk/BOOK/testsuite-tools/common/tcl.xml
===================================================================
--- trunk/BOOK/testsuite-tools/common/tcl.xml	2006-01-15 12:21:38 UTC (rev 1079)
+++ trunk/BOOK/testsuite-tools/common/tcl.xml	2006-01-15 18:06:36 UTC (rev 1080)
@@ -37,9 +37,7 @@
     to support running the test suites for GCC and Binutils. Installing
     three packages for testing purposes may seem excessive, but it is very
     reassuring, if not essential, to know that the most important tools are
-    working properly. Even if the test suites are not run in this chapter
-    (they are not mandatory), these packages are required to run the test
-    suites in <xref linkend="chapter-building-system"/>.</para>
+    working properly.</para>
 
     <para os="c1">First, fix a syntax error in the configure script.</para>
 




More information about the cross-lfs mailing list