Changeset e1beb751

Timestamp:

Feb 21, 2006, 2:13:14 AM (18 years ago)

Author:

Jim Gifford <clfs@…>

Children:

0f559d45

Parents:

89da68b

Message:

r1082@server (orig r1080): chris | 2006-01-15 10:06:36 -0800
Various minor text fixes, and a correction to the temp-perl installation instructions

Files:

• final-system/common/temp-perl.xml (modified) (3 diffs)
• final-system/multilib/temp-perl.xml (modified) (2 diffs)
• temp-system/common/bash.xml (modified) (1 diff)
• temp-system/common/texinfo.xml (modified) (1 diff)
• testsuite-tools/common/tcl.xml (modified) (1 diff)

final-system/common/temp-perl.xml

@@ -28 +28 @@
 <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&mdash;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>
 
@@ -38 +42 @@
           <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>
@@ -44 +48 @@
     </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>

final-system/multilib/temp-perl.xml

@@ -31 +31 @@
     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"
@@ -53 +53 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/temp-perl.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
   </sect2>
 

temp-system/common/bash.xml

@@ -55 +55 @@
           <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>

temp-system/common/texinfo.xml

@@ -28 +28 @@
 
 <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"

testsuite-tools/common/tcl.xml

@@ -38 +38 @@
     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>