r781 - in trunk/BOOK: . introduction/common temp-tools/64 temp-tools/common temp-tools/multilib

jim at linuxfromscratch.org jim at linuxfromscratch.org
Wed Nov 30 22:29:12 PST 2005


Author: jim
Date: 2005-11-30 23:29:11 -0700 (Wed, 30 Nov 2005)
New Revision: 781

Modified:
   trunk/BOOK/
   trunk/BOOK/introduction/common/changelog.xml
   trunk/BOOK/temp-tools/64/perl-64bit.xml
   trunk/BOOK/temp-tools/64/tcl-64bit.xml
   trunk/BOOK/temp-tools/common/dejagnu.xml
   trunk/BOOK/temp-tools/common/expect.xml
   trunk/BOOK/temp-tools/common/perl.xml
   trunk/BOOK/temp-tools/common/tcl.xml
   trunk/BOOK/temp-tools/common/texinfo.xml
   trunk/BOOK/temp-tools/multilib/perl.xml
   trunk/BOOK/temp-tools/multilib/tcl-64bit.xml
   trunk/BOOK/temp-tools/multilib/texinfo.xml
Log:
 r840 at server:  jim | 2005-11-30 22:28:43 -0800
 Text updates to temp-tools



Property changes on: trunk/BOOK
___________________________________________________________________
Name: svk:merge
   - 3949c430-d905-0410-97b6-f115d20341b5:/cross-lfs:839
f6929928-7304-0410-9559-ff6106abff4d:/cross-lfs:790
   + 3949c430-d905-0410-97b6-f115d20341b5:/cross-lfs:840
f6929928-7304-0410-9559-ff6106abff4d:/cross-lfs:790

Modified: trunk/BOOK/introduction/common/changelog.xml
===================================================================
--- trunk/BOOK/introduction/common/changelog.xml	2005-12-01 06:29:02 UTC (rev 780)
+++ trunk/BOOK/introduction/common/changelog.xml	2005-12-01 06:29:11 UTC (rev 781)
@@ -42,6 +42,9 @@
         <listitem>
           <para>[jim] - Text updates to final-system.</para>
         </listitem>
+        <listitem>
+          <para>[jim] - Text updates to temp-tools.</para>
+        </listitem>
       </itemizedlist>
     </listitem>
 

Modified: trunk/BOOK/temp-tools/64/perl-64bit.xml
===================================================================
--- trunk/BOOK/temp-tools/64/perl-64bit.xml	2005-12-01 06:29:02 UTC (rev 780)
+++ trunk/BOOK/temp-tools/64/perl-64bit.xml	2005-12-01 06:29:11 UTC (rev 781)
@@ -24,42 +24,42 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
+    xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
+    xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
+    xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>./configure.gnu --prefix=/tools -Dstatic_ext='Data/Dumper IO Fcntl POSIX' \
+<screen os="d"><userinput>./configure.gnu --prefix=/tools -Dstatic_ext='Data/Dumper IO Fcntl POSIX' \
    -Dcc="gcc ${BUILD64}"</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
+    xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
+    xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='af'])"/>
+    xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='ag'])"/>
+    xpointer="xpointer(//*[@os='h'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='ah'])"/>
+    xpointer="xpointer(//*[@os='i'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='ai'])"/>
+    xpointer="xpointer(//*[@os='j'])"/>
 
   </sect2>
 

Modified: trunk/BOOK/temp-tools/64/tcl-64bit.xml
===================================================================
--- trunk/BOOK/temp-tools/64/tcl-64bit.xml	2005-12-01 06:29:02 UTC (rev 780)
+++ trunk/BOOK/temp-tools/64/tcl-64bit.xml	2005-12-01 06:29:11 UTC (rev 781)
@@ -29,15 +29,11 @@
     href="../common/tcl.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
-<screen><userinput>cd unix
+<screen os="c"><userinput>cd unix
 CC="gcc ${BUILD64}" ./configure --prefix=/tools</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/tcl.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tcl.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -54,6 +50,10 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/tcl.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/tcl.xml"
     xpointer="xpointer(//*[@os='i'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/temp-tools/common/dejagnu.xml
===================================================================
--- trunk/BOOK/temp-tools/common/dejagnu.xml	2005-12-01 06:29:02 UTC (rev 780)
+++ trunk/BOOK/temp-tools/common/dejagnu.xml	2005-12-01 06:29:11 UTC (rev 781)
@@ -34,13 +34,13 @@
   <sect2 role="installation">
     <title>Installation of DejaGNU</title>
 
-    <para>Prepare DejaGNU for compilation:</para>
+    <para os="a">Prepare DejaGNU for compilation:</para>
 
-<screen><userinput>./configure --prefix=/tools</userinput></screen>
+<screen os="b"><userinput>./configure --prefix=/tools</userinput></screen>
 
-    <para>Build and install the package:</para>
+    <para os="c">Build and install the package:</para>
 
-<screen><userinput>make install</userinput></screen>
+<screen os="d"><userinput>make install</userinput></screen>
 
   </sect2>
 

Modified: trunk/BOOK/temp-tools/common/expect.xml
===================================================================
--- trunk/BOOK/temp-tools/common/expect.xml	2005-12-01 06:29:02 UTC (rev 780)
+++ trunk/BOOK/temp-tools/common/expect.xml	2005-12-01 06:29:11 UTC (rev 781)
@@ -41,10 +41,10 @@
 
     <para os="c">Now prepare Expect for compilation:</para>
 
-<screen><userinput>./configure --prefix=/tools --with-tcl=/tools/lib \
+<screen os="d"><userinput>./configure --prefix=/tools --with-tcl=/tools/lib \
    --with-tclinclude=/tools/include --with-x=no</userinput></screen>
 
-    <variablelist os="d">
+    <variablelist os="e">
       <title>The meaning of the configure options:</title>
 
       <varlistentry>
@@ -77,21 +77,21 @@
 
     </variablelist>
 
-    <para os="e">Build the package:</para>
+    <para os="f">Build the package:</para>
 
-<screen os="f"><userinput>make</userinput></screen>
+<screen os="g"><userinput>make</userinput></screen>
 
-    <para os="g">To test the results, issue: <userinput>make test</userinput>.
+    <para os="h">To test the results, issue: <userinput>make test</userinput>.
     Note that the Expect test suite is known to experience failures under
     certain host conditions that are not within our control. Therefore,
     test suite failures here are not surprising and are not considered
     critical.</para>
 
-    <para os="h">Install the package:</para>
+    <para os="i">Install the package:</para>
 
-<screen os="i"><userinput>make SCRIPTS="" install</userinput></screen>
+<screen os="j"><userinput>make SCRIPTS="" install</userinput></screen>
 
-    <variablelist os="j">
+    <variablelist os="k">
       <title>The meaning of the make parameter:</title>
 
       <varlistentry>

Modified: trunk/BOOK/temp-tools/common/perl.xml
===================================================================
--- trunk/BOOK/temp-tools/common/perl.xml	2005-12-01 06:29:02 UTC (rev 780)
+++ trunk/BOOK/temp-tools/common/perl.xml	2005-12-01 06:29:11 UTC (rev 781)
@@ -22,17 +22,17 @@
   <sect2 role="installation">
     <title>Installation of Perl</title>
 
-    <para os="aa">First adapt some hard-wired paths to the C library by applying
+    <para os="a">First adapt some hard-wired paths to the C library by applying
     the following patch:</para>
 
-<screen os="ab"><userinput>patch -Np1 -i ../&perl-libc-patch;</userinput></screen>
+<screen os="b"><userinput>patch -Np1 -i ../&perl-libc-patch;</userinput></screen>
 
-    <para os="ac">Prepare Perl for compilation (make sure to get the 'Data/Dumper
+    <para os="c">Prepare Perl for compilation (make sure to get the 'Data/Dumper
     IO Fcntl POSIX' part of the command correct—they are all letters):</para>
 
-<screen><userinput>./configure.gnu --prefix=/tools -Dstatic_ext='Data/Dumper IO Fcntl POSIX'</userinput></screen>
+<screen os="d"><userinput>./configure.gnu --prefix=/tools -Dstatic_ext='Data/Dumper IO Fcntl POSIX'</userinput></screen>
 
-    <variablelist os="ad">
+    <variablelist os="e">
       <title>The meaning of the configure option:</title>
 
       <varlistentry>
@@ -46,20 +46,20 @@
 
     </variablelist>
 
-    <para os="ae">Only a few of the utilities contained in this package need to be
+    <para os="f">Only a few of the utilities contained in this package need to be
     built:</para>
 
-<screen os="af"><userinput>make perl utilities</userinput></screen>
+<screen os="g"><userinput>make perl utilities</userinput></screen>
 
-    <para os="ag">Although Perl comes with a test suite, it is not recommended to
+    <para os="h">Although Perl comes with a test suite, it is not recommended to
     run it at this point. Only part of Perl was built and running
     <userinput>make test</userinput> now will cause the rest of Perl to be
     built as well, which is unnecessary at this point. The test suite can
     be run in the next chapter if desired.</para>
 
-    <para os="ah">Install these tools and their libraries:</para>
+    <para os="i">Install these tools and their libraries:</para>
 
-<screen os="ai"><userinput>cp perl pod/pod2man /tools/bin
+<screen os="j"><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/temp-tools/common/tcl.xml
===================================================================
--- trunk/BOOK/temp-tools/common/tcl.xml	2005-12-01 06:29:02 UTC (rev 780)
+++ trunk/BOOK/temp-tools/common/tcl.xml	2005-12-01 06:29:11 UTC (rev 781)
@@ -43,14 +43,14 @@
 
     <para os="b">Prepare Tcl for compilation:</para>
 
-<screen><userinput>cd unix
+<screen os="c"><userinput>cd unix
 ./configure --prefix=/tools</userinput></screen>
 
-    <para os="c">Build the package:</para>
+    <para os="d">Build the package:</para>
 
-<screen os="d"><userinput>make</userinput></screen>
+<screen os="e"><userinput>make</userinput></screen>
 
-    <para os="e">To test the results, issue: <userinput>TZ=UTC make
+    <para os="f">To test the results, issue: <userinput>TZ=UTC make
     test</userinput>. The Tcl test suite is known to experience failures
     under certain host conditions that are not fully understood.
     Therefore, test suite failures here are not surprising, and are not
@@ -61,9 +61,9 @@
     Details on the <envar>TZ</envar> environment variable are provided in
     <xref linkend="chapter-bootscripts"/>.</para>
 
-    <para os="f">Install the package:</para>
+    <para os="g">Install the package:</para>
 
-<screen os="g"><userinput>make install</userinput></screen>
+<screen os="h"><userinput>make install</userinput></screen>
 
     <para os="i">Now we will install the TCL headers into /tools.</para>
 

Modified: trunk/BOOK/temp-tools/common/texinfo.xml
===================================================================
--- trunk/BOOK/temp-tools/common/texinfo.xml	2005-12-01 06:29:02 UTC (rev 780)
+++ trunk/BOOK/temp-tools/common/texinfo.xml	2005-12-01 06:29:11 UTC (rev 781)
@@ -26,15 +26,15 @@
     href="../../final-system/common/texinfo.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>./configure --prefix=/tools</userinput></screen>
+<screen os="b"><userinput>./configure --prefix=/tools</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/texinfo.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
+    xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/texinfo.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
+    xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/texinfo.xml"

Modified: trunk/BOOK/temp-tools/multilib/perl.xml
===================================================================
--- trunk/BOOK/temp-tools/multilib/perl.xml	2005-12-01 06:29:02 UTC (rev 780)
+++ trunk/BOOK/temp-tools/multilib/perl.xml	2005-12-01 06:29:11 UTC (rev 781)
@@ -22,13 +22,13 @@
   <sect2 role="installation">
     <title>Installation of Perl</title>
 
-    <para os="a0a">We need a working Perl to build glibc and test coreutils, it
+    <para os="m1">We need a working Perl to build glibc and test coreutils, it
     doesn't matter whether this is a 32-bit or a 64-bit program. But, the perl
     configure process knows nothing about multilib and assumes it will be installed
     in a 'lib' directory.  Using the same patch as for non-multilib systems we can
     easily install into <filename class="directory">/tools/lib</filename>.</para>
 
-    <para os="a0b">Installing successfully into a different directory such as
+    <para os="m2">Installing successfully into a different directory such as
     <filename class="directory">/tools/lib64</filename> would require more effort
    (compare how we install Perl in the final system) for no real gain. On this
    multilib system, <filename class="directory">/tools/lib</filename> is where we
@@ -37,42 +37,42 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
+    xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
+    xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
+    xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>./configure.gnu --prefix=/tools -Dstatic_ext='Data/Dumper IO Fcntl POSIX' \
+<screen os="d"><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/perl.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
+    xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
+    xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='af'])"/>
+    xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='ag'])"/>
+    xpointer="xpointer(//*[@os='h'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='ah'])"/>
+    xpointer="xpointer(//*[@os='i'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='ai'])"/>
+    xpointer="xpointer(//*[@os='j'])"/>
 
   </sect2>
 

Modified: trunk/BOOK/temp-tools/multilib/tcl-64bit.xml
===================================================================
--- trunk/BOOK/temp-tools/multilib/tcl-64bit.xml	2005-12-01 06:29:02 UTC (rev 780)
+++ trunk/BOOK/temp-tools/multilib/tcl-64bit.xml	2005-12-01 06:29:11 UTC (rev 781)
@@ -25,20 +25,19 @@
     href="../common/tcl.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
+    <para os="m1">We need to change the default lib path to lib64:</para>
+
+<screen os="m2"><userinput>cd unix
+sed -i 's@\$(prefix)/lib@\$(prefix)/lib64 at g' Makefile.in</userinput></screen>
+
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/tcl.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
-<screen><userinput>cd unix
-sed -i 's@\$(prefix)/lib@\$(prefix)/lib64 at g' Makefile.in
-CC="gcc ${BUILD64}" ./configure --prefix=/tools --libdir=/tools/lib64</userinput></screen>
+<screen os="c"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/tools --libdir=/tools/lib64</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/tcl.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tcl.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -55,6 +54,10 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/tcl.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/tcl.xml"
     xpointer="xpointer(//*[@os='i'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/temp-tools/multilib/texinfo.xml
===================================================================
--- trunk/BOOK/temp-tools/multilib/texinfo.xml	2005-12-01 06:29:02 UTC (rev 780)
+++ trunk/BOOK/temp-tools/multilib/texinfo.xml	2005-12-01 06:29:11 UTC (rev 781)
@@ -26,15 +26,15 @@
     href="../common/texinfo.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/tools</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/tools</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/texinfo.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
+    xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/texinfo.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
+    xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/texinfo.xml"




More information about the cross-lfs mailing list