r785 - in trunk/BOOK: . cross-tools/x86_64 final-system/multilib temp-system/multilib temp-tools/multilib

jim at linuxfromscratch.org jim at linuxfromscratch.org
Thu Dec 1 01:45:10 PST 2005


Author: jim
Date: 2005-12-01 02:45:03 -0700 (Thu, 01 Dec 2005)
New Revision: 785

Modified:
   trunk/BOOK/
   trunk/BOOK/cross-tools/x86_64/gcc-static.xml
   trunk/BOOK/final-system/multilib/bzip2-64bit.xml
   trunk/BOOK/final-system/multilib/e2fsprogs-64bit.xml
   trunk/BOOK/final-system/multilib/readline-64bit.xml
   trunk/BOOK/final-system/multilib/sed.xml
   trunk/BOOK/temp-system/multilib/zlib.xml
   trunk/BOOK/temp-tools/multilib/expect-64bit.xml
Log:
 r849 at server:  jim | 2005-12-01 01:44:45 -0800
 Text Update Fixes



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

Modified: trunk/BOOK/cross-tools/x86_64/gcc-static.xml
===================================================================
--- trunk/BOOK/cross-tools/x86_64/gcc-static.xml	2005-12-01 09:10:03 UTC (rev 784)
+++ trunk/BOOK/cross-tools/x86_64/gcc-static.xml	2005-12-01 09:45:03 UTC (rev 785)
@@ -79,14 +79,14 @@
     href="../../final-system/common/gcc.xml"
     xpointer="xpointer(//*[@os='h'])"/>
 
-<screen><userinput>../gcc-&gcc-version;/configure --prefix=/cross-tools \
+<screen os="al"><userinput>../gcc-&gcc-version;/configure --prefix=/cross-tools \
     --host=${LFS_HOST} --target=${LFS_TARGET} \
     --with-local-prefix=/tools --disable-nls --disable-shared \
     --disable-threads --enable-languages=c</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/gcc-static.xml"
-    xpointer="xpointer(//*[@os='al'])"/>
+    xpointer="xpointer(//*[@os='am'])"/>
 
     <para>Continue with compiling the package:</para>
 

Modified: trunk/BOOK/final-system/multilib/bzip2-64bit.xml
===================================================================
--- trunk/BOOK/final-system/multilib/bzip2-64bit.xml	2005-12-01 09:10:03 UTC (rev 784)
+++ trunk/BOOK/final-system/multilib/bzip2-64bit.xml	2005-12-01 09:45:03 UTC (rev 785)
@@ -55,7 +55,7 @@
     href="bzip2.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="d"><userinput>make CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}"</userinput></screen>
+<screen os="e"><userinput>make CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}"</userinput></screen>
 
     <para os="m3">Now we remove the 32 bit versions of the programs so we
     can install the 64 bit versions.</para>
@@ -64,14 +64,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="bzip2.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="bzip2.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="bzip2.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/final-system/multilib/e2fsprogs-64bit.xml
===================================================================
--- trunk/BOOK/final-system/multilib/e2fsprogs-64bit.xml	2005-12-01 09:10:03 UTC (rev 784)
+++ trunk/BOOK/final-system/multilib/e2fsprogs-64bit.xml	2005-12-01 09:45:03 UTC (rev 785)
@@ -42,10 +42,6 @@
     --with-root-prefix="" --enable-elf-shlibs --disable-evms</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/e2fsprogs.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 

Modified: trunk/BOOK/final-system/multilib/readline-64bit.xml
===================================================================
--- trunk/BOOK/final-system/multilib/readline-64bit.xml	2005-12-01 09:10:03 UTC (rev 784)
+++ trunk/BOOK/final-system/multilib/readline-64bit.xml	2005-12-01 09:45:03 UTC (rev 785)
@@ -42,6 +42,10 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="readline.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="readline.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/final-system/multilib/sed.xml
===================================================================
--- trunk/BOOK/final-system/multilib/sed.xml	2005-12-01 09:10:03 UTC (rev 784)
+++ trunk/BOOK/final-system/multilib/sed.xml	2005-12-01 09:45:03 UTC (rev 785)
@@ -38,10 +38,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/sed.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sed.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/temp-system/multilib/zlib.xml
===================================================================
--- trunk/BOOK/temp-system/multilib/zlib.xml	2005-12-01 09:10:03 UTC (rev 784)
+++ trunk/BOOK/temp-system/multilib/zlib.xml	2005-12-01 09:45:03 UTC (rev 785)
@@ -30,9 +30,8 @@
     href="../common/zlib.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/zlib.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
+<screen os="c"><userinput>CC="${CC} ${BUILD32}" \
+   ./configure --prefix=/tools --shared</userinput></screen>
 
     <variablelist os="aa">
       <title>The meaning of the configure options:</title>

Modified: trunk/BOOK/temp-tools/multilib/expect-64bit.xml
===================================================================
--- trunk/BOOK/temp-tools/multilib/expect-64bit.xml	2005-12-01 09:10:03 UTC (rev 784)
+++ trunk/BOOK/temp-tools/multilib/expect-64bit.xml	2005-12-01 09:45:03 UTC (rev 785)
@@ -33,16 +33,12 @@
     href="../common/expect.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/tools \
+<screen os="d"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/tools \
    --with-tcl=/tools/lib64 --with-tclinclude=/tools/include  \
    --libdir=/tools/lib64 --with-x=no</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/expect.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/expect.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"




More information about the cross-lfs mailing list