r833 - in trunk/BOOK: . cross-tools/alpha cross-tools/x86 cross-tools/x86_64 cross-tools/x86_64-64

[jim at linuxfromscratch.org]

Author: jim
Date: 2005-12-05 16:20:37 -0700 (Mon, 05 Dec 2005)
New Revision: 833

Modified:
   trunk/BOOK/
   trunk/BOOK/cross-tools/alpha/glibc-headers.xml
   trunk/BOOK/cross-tools/x86/glibc-headers.xml
   trunk/BOOK/cross-tools/x86_64-64/glibc-headers.xml
   trunk/BOOK/cross-tools/x86_64/glibc-headers.xml
   trunk/BOOK/sparcv8-index.xml
Log:
 r941 at server:  jim | 2005-12-05 15:20:14 -0800
 Fixed typo for Sparcv8



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

Modified: trunk/BOOK/cross-tools/alpha/glibc-headers.xml
===================================================================
--- trunk/BOOK/cross-tools/alpha/glibc-headers.xml	2005-12-05 23:14:11 UTC (rev 832)
+++ trunk/BOOK/cross-tools/alpha/glibc-headers.xml	2005-12-05 23:20:37 UTC (rev 833)
@@ -39,14 +39,20 @@
     xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='dd'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='de'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/glibc.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
-<screen><userinput>CC=gcc ../glibc-&glibc-version;/configure --prefix=/tools \
-    --host=${LFS_TARGET} --build=${LFS_HOST} \
-    --disable-sanity-checks --enable-kernel=2.6.0 \
-    --with-headers=/tools/include \
-    --with-binutils=/cross-tools/${LFS_TARGET}/bin</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc-headers.xml"
+    xpointer="xpointer(//*[@os='s3'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/glibc-headers.xml"

Modified: trunk/BOOK/cross-tools/x86/glibc-headers.xml
===================================================================
--- trunk/BOOK/cross-tools/x86/glibc-headers.xml	2005-12-05 23:14:11 UTC (rev 832)
+++ trunk/BOOK/cross-tools/x86/glibc-headers.xml	2005-12-05 23:20:37 UTC (rev 833)
@@ -39,13 +39,21 @@
     xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='dd'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='de'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/glibc.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
 <screen os="s3"><userinput>CC=gcc ../glibc-&glibc-version;/configure --prefix=/tools \
     --host=${LFS_TARGET} --build=${LFS_HOST} \
     --disable-sanity-checks --enable-kernel=2.6.0 \
-    --with-headers=/tools/include \
+    --with-headers=/tools/include --cache-file=config.cache \
     --with-binutils=/cross-tools/${LFS_TARGET}/bin</userinput></screen>
 
    <warning os="e1">

Modified: trunk/BOOK/cross-tools/x86_64/glibc-headers.xml
===================================================================
--- trunk/BOOK/cross-tools/x86_64/glibc-headers.xml	2005-12-05 23:14:11 UTC (rev 832)
+++ trunk/BOOK/cross-tools/x86_64/glibc-headers.xml	2005-12-05 23:20:37 UTC (rev 833)
@@ -39,6 +39,14 @@
     xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='dd'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='de'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/glibc.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 

Modified: trunk/BOOK/cross-tools/x86_64-64/glibc-headers.xml
===================================================================
--- trunk/BOOK/cross-tools/x86_64-64/glibc-headers.xml	2005-12-05 23:14:11 UTC (rev 832)
+++ trunk/BOOK/cross-tools/x86_64-64/glibc-headers.xml	2005-12-05 23:20:37 UTC (rev 833)
@@ -39,6 +39,14 @@
     xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='dd'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='de'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/glibc.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 

Modified: trunk/BOOK/sparcv8-index.xml
===================================================================
--- trunk/BOOK/sparcv8-index.xml	2005-12-05 23:14:11 UTC (rev 832)
+++ trunk/BOOK/sparcv8-index.xml	2005-12-05 23:20:37 UTC (rev 833)
@@ -47,7 +47,7 @@
 
     <title>Building the Basic Tools</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="temp-system/sparc-chapter.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="temp-system/sparcv8-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="boot/sparc-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="chroot/sparc-chapter.xml"/>