r6618 - in branches/cross-lfs/BOOK/cross-tools: mips mips64 ppc sparc sparc64 x86 x86_64

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Sat Aug 6 06:10:22 PDT 2005


Author: manuel
Date: 2005-08-06 07:10:21 -0600 (Sat, 06 Aug 2005)
New Revision: 6618

Modified:
   branches/cross-lfs/BOOK/cross-tools/mips/glibc.xml
   branches/cross-lfs/BOOK/cross-tools/mips64/glibc-64bit.xml
   branches/cross-lfs/BOOK/cross-tools/mips64/glibc-n32.xml
   branches/cross-lfs/BOOK/cross-tools/mips64/glibc.xml
   branches/cross-lfs/BOOK/cross-tools/ppc/glibc.xml
   branches/cross-lfs/BOOK/cross-tools/sparc/glibc.xml
   branches/cross-lfs/BOOK/cross-tools/sparc64/glibc-64bit.xml
   branches/cross-lfs/BOOK/cross-tools/sparc64/glibc.xml
   branches/cross-lfs/BOOK/cross-tools/x86/glibc-headers.xml
   branches/cross-lfs/BOOK/cross-tools/x86/glibc.xml
   branches/cross-lfs/BOOK/cross-tools/x86_64/glibc-64bit.xml
   branches/cross-lfs/BOOK/cross-tools/x86_64/glibc-headers.xml
   branches/cross-lfs/BOOK/cross-tools/x86_64/glibc.xml
Log:
Redone Xinclude stuff on cross-tools Glibc files.

Modified: branches/cross-lfs/BOOK/cross-tools/mips/glibc.xml
===================================================================
--- branches/cross-lfs/BOOK/cross-tools/mips/glibc.xml	2005-08-06 12:20:52 UTC (rev 6617)
+++ branches/cross-lfs/BOOK/cross-tools/mips/glibc.xml	2005-08-06 13:10:21 UTC (rev 6618)
@@ -45,41 +45,47 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/glibc.xml"
-    xpointer="xpointer(//*[@role='installation']/para[1])"/>
+    xpointer="xpointer(//*[@os='da'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/mips/glibc.xml"
-    xpointer="xpointer(//*[@role='installation']/para[2])"/>
+    xpointer="xpointer(//*[@os='ba'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/mips/glibc.xml"
-    xpointer="xpointer(//*[@role='installation']/para[4])"/>
+    xpointer="xpointer(//*[@os='bb'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/mips/glibc.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[1])"/>
+    xpointer="xpointer(//*[@os='bc'])"/>
 
-    <para>We will disable the linking to libgcc_eh:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='db'])"/>
 
-<screen><userinput>patch -Np1 -i ../&glibc-libgcc_eh-patch;</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='dc'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/mips/glibc.xml"
-    xpointer="xpointer(//*[@role='installation']/para[5])"/>
+    xpointer="xpointer(//*[@os='bd'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/mips/glibc.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[2])"/>
+    xpointer="xpointer(//*[@os='be'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/x86/glibc.xml"
-    xpointer="xpointer(id('install-glibc')/para[4])"/>
+    href="../../final-system/mips/glibc.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/x86/glibc.xml"
-    xpointer="xpointer(id('install-glibc')/screen[2])"/>
+    href="../../final-system/mips/glibc.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
-<para>Next, prepare Glibc for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/mips/glibc.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
 <screen><userinput>BUILD_CC="gcc" CC="${LFS_TARGET}-gcc" \
     AR="${LFS_TARGET}-ar" RANLIB="${LFS_TARGET}-ranlib" \
@@ -91,15 +97,15 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/glibc.xml"
-    xpointer="xpointer(//*[@role='installation']/para[5])"/>
+    xpointer="xpointer(//*[@os='df'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/glibc.xml"
-    xpointer="xpointer(//*[@role='installation']/blockquote[1])"/>
+    xpointer="xpointer(//*[@os='dg'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/glibc.xml"
-    xpointer="xpointer(//*[@role='installation']/para[6])"/>
+    xpointer="xpointer(//*[@os='dh'])"/>
 
     <para>Compile the package:</para>
 

Modified: branches/cross-lfs/BOOK/cross-tools/mips64/glibc-64bit.xml
===================================================================
--- branches/cross-lfs/BOOK/cross-tools/mips64/glibc-64bit.xml	2005-08-06 12:20:52 UTC (rev 6617)
+++ branches/cross-lfs/BOOK/cross-tools/mips64/glibc-64bit.xml	2005-08-06 13:10:21 UTC (rev 6618)
@@ -44,47 +44,53 @@
     <title>Installation of Glibc</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/glibc.xml"
-    xpointer="xpointer(//*[@role='installation']/para[1])"/>
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='da'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/glibc.xml"
-    xpointer="xpointer(//*[@role='installation']/para[2])"/>
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='ba'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/glibc.xml"
-    xpointer="xpointer(//*[@role='installation']/para[4])"/>
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='bb'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/glibc.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[1])"/>
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='bc'])"/>
 
-    <para>We will disable the linking to libgcc_eh:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='db'])"/>
 
-<screen><userinput>patch -Np1 -i ../&glibc-libgcc_eh-patch;</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='dc'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/glibc.xml"
-    xpointer="xpointer(//*[@role='installation']/para[5])"/>
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='bd'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/glibc.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[2])"/>
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='be'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/x86/glibc.xml"
-    xpointer="xpointer(id('install-glibc')/para[4])"/>
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/x86/glibc.xml"
-    xpointer="xpointer(id('install-glibc')/screen[2])"/>
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
     <para>Now we make sure the Glibc goes into <filename
     class="directory">/tools/lib64</filename>:</para>
 
 <screen><userinput>echo "slibdir=/tools/lib64" >> configparms</userinput></screen>
 
-    <para>Next, prepare Glibc for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
 <screen><userinput>BUILD_CC="gcc" CC="${LFS_TARGET}-gcc ${BUILD64}" \
     AR="${LFS_TARGET}-ar" RANLIB="${LFS_TARGET}-ranlib" \

Modified: branches/cross-lfs/BOOK/cross-tools/mips64/glibc-n32.xml
===================================================================
--- branches/cross-lfs/BOOK/cross-tools/mips64/glibc-n32.xml	2005-08-06 12:20:52 UTC (rev 6617)
+++ branches/cross-lfs/BOOK/cross-tools/mips64/glibc-n32.xml	2005-08-06 13:10:21 UTC (rev 6618)
@@ -44,47 +44,53 @@
     <title>Installation of Glibc</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/glibc.xml"
-    xpointer="xpointer(//*[@role='installation']/para[1])"/>
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='da'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/glibc.xml"
-    xpointer="xpointer(//*[@role='installation']/para[2])"/>
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='ba'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/glibc.xml"
-    xpointer="xpointer(//*[@role='installation']/para[4])"/>
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='bb'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/glibc.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[1])"/>
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='bc'])"/>
 
-    <para>We will disable the linking to libgcc_eh:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='db'])"/>
 
-<screen><userinput>patch -Np1 -i ../&glibc-libgcc_eh-patch;</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='dc'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/glibc.xml"
-    xpointer="xpointer(//*[@role='installation']/para[5])"/>
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='bd'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/glibc.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[2])"/>
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='be'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/x86/glibc.xml"
-    xpointer="xpointer(id('install-glibc')/para[4])"/>
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/x86/glibc.xml"
-    xpointer="xpointer(id('install-glibc')/screen[2])"/>
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
     <para>Now we make sure the Glibc goes into <filename
     class="directory">/tools/lib32</filename>:</para>
 
 <screen><userinput>echo "slibdir=/tools/lib32" >> configparms</userinput></screen>
 
-    <para>Next, prepare Glibc for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
 <screen><userinput>BUILD_CC="gcc" CC="${LFS_TARGET}-gcc ${BUILDN32}" \
     AR="${LFS_TARGET}-ar" RANLIB="${LFS_TARGET}-ranlib" \

Modified: branches/cross-lfs/BOOK/cross-tools/mips64/glibc.xml
===================================================================
--- branches/cross-lfs/BOOK/cross-tools/mips64/glibc.xml	2005-08-06 12:20:52 UTC (rev 6617)
+++ branches/cross-lfs/BOOK/cross-tools/mips64/glibc.xml	2005-08-06 13:10:21 UTC (rev 6618)
@@ -45,46 +45,52 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/glibc.xml"
-    xpointer="xpointer(//*[@role='installation']/para[1])"/>
+    xpointer="xpointer(//*[@os='da'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/glibc.xml"
-    xpointer="xpointer(//*[@role='installation']/para[2])"/>
+    href="../../final-system/mips64/glibc.xml"
+    xpointer="xpointer(//*[@os='ba'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/glibc.xml"
-    xpointer="xpointer(//*[@role='installation']/para[4])"/>
+    href="../../final-system/mips64/glibc.xml"
+    xpointer="xpointer(//*[@os='bb'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/glibc.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[1])"/>
+    href="../../final-system/mips64/glibc.xml"
+    xpointer="xpointer(//*[@os='bc'])"/>
 
-    <para>We will disable the linking to libgcc_eh:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='db'])"/>
 
-<screen><userinput>patch -Np1 -i ../&glibc-libgcc_eh-patch;</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='dc'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/glibc.xml"
-    xpointer="xpointer(//*[@role='installation']/para[5])"/>
+    href="../../final-system/mips64/glibc.xml"
+    xpointer="xpointer(//*[@os='bd'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/glibc.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[2])"/>
+    href="../../final-system/mips64/glibc.xml"
+    xpointer="xpointer(//*[@os='be'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/x86/glibc.xml"
-    xpointer="xpointer(id('install-glibc')/para[4])"/>
+    href="../../final-system/mips64/glibc.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/x86/glibc.xml"
-    xpointer="xpointer(id('install-glibc')/screen[2])"/>
+    href="../../final-system/mips64/glibc.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
     <para>Now we make sure the Glibc goes into <filename
     class="directory">/tools/lib</filename>:</para>
 
 <screen><userinput>echo "slibdir=/tools/lib" >> configparms</userinput></screen>
 
-    <para>Next, prepare Glibc for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/mips64/glibc.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
 <screen><userinput>BUILD_CC="gcc" CC="${LFS_TARGET}-gcc ${BUILD32}" \
     AR="${LFS_TARGET}-ar" RANLIB="${LFS_TARGET}-ranlib" \
@@ -108,15 +114,15 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/glibc.xml"
-    xpointer="xpointer(//*[@role='installation']/para[5])"/>
+    xpointer="xpointer(//*[@os='df'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/glibc.xml"
-    xpointer="xpointer(//*[@role='installation']/blockquote[1])"/>
+    xpointer="xpointer(//*[@os='dg'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/glibc.xml"
-    xpointer="xpointer(//*[@role='installation']/para[6])"/>
+    xpointer="xpointer(//*[@os='dh'])"/>
 
     <para>Compile the package:</para>
 

Modified: branches/cross-lfs/BOOK/cross-tools/ppc/glibc.xml
===================================================================
--- branches/cross-lfs/BOOK/cross-tools/ppc/glibc.xml	2005-08-06 12:20:52 UTC (rev 6617)
+++ branches/cross-lfs/BOOK/cross-tools/ppc/glibc.xml	2005-08-06 13:10:21 UTC (rev 6618)
@@ -45,30 +45,39 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/glibc.xml"
-    xpointer="xpointer(//*[@role='installation']/para[1])"/>
+    xpointer="xpointer(//*[@os='da'])"/>
 
-    <para>We will disable the linking to libgcc_eh:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='db'])"/>
 
-<screen><userinput>patch -Np1 -i ../&glibc-libgcc_eh-patch;</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='dc'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/x86/glibc.xml"
-    xpointer="xpointer(id('install-glibc')/para[4])"/>
+    href="../../final-system/ppc/glibc.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/x86/glibc.xml"
-    xpointer="xpointer(id('install-glibc')/screen[2])"/>
+    href="../../final-system/ppc/glibc.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
     <para>On the PPC arch, NPTL requires the following to be set:</para>
 
 <screen><userinput>echo "libc_cv_ppc_machine=yes" > config.cache</userinput></screen>
 
-    <para> For NPTL enabled systems we will need to add the following lines to config.cache:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='dd'])"/>
 
-<screen><userinput>echo "libc_cv_forced_unwind=yes" >> config.cache
-echo "libc_cv_c_cleanup=yes" >> config.cache</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='de'])"/>
 
-    <para>Next, prepare Glibc for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/ppc/glibc.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
 <screen><userinput>BUILD_CC="gcc" CC="${LFS_TARGET}-gcc" \
     AR="${LFS_TARGET}-ar" RANLIB="${LFS_TARGET}-ranlib" \
@@ -81,15 +90,15 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/glibc.xml"
-    xpointer="xpointer(//*[@role='installation']/para[5])"/>
+    xpointer="xpointer(//*[@os='df'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/glibc.xml"
-    xpointer="xpointer(//*[@role='installation']/blockquote[1])"/>
+    xpointer="xpointer(//*[@os='dg'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/glibc.xml"
-    xpointer="xpointer(//*[@role='installation']/para[6])"/>
+    xpointer="xpointer(//*[@os='dh'])"/>
 
     <para>Compile the package:</para>
 

Modified: branches/cross-lfs/BOOK/cross-tools/sparc/glibc.xml
===================================================================
--- branches/cross-lfs/BOOK/cross-tools/sparc/glibc.xml	2005-08-06 12:20:52 UTC (rev 6617)
+++ branches/cross-lfs/BOOK/cross-tools/sparc/glibc.xml	2005-08-06 13:10:21 UTC (rev 6618)
@@ -44,33 +44,39 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/glibc.xml"
-    xpointer="xpointer(//*[@role='installation']/para[1])"/>
+    xpointer="xpointer(//*[@os='da'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/glibc.xml"
-    xpointer="xpointer(//*[@role='installation']/para[2])"/>
+    href="../../final-system/sparc/glibc.xml"
+    xpointer="xpointer(//*[@os='ba'])"/>
 
-    <para>We will disable the linking to libgcc_eh:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='db'])"/>
 
-<screen><userinput>patch -Np1 -i ../&glibc-libgcc_eh-patch;</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='dc'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/glibc.xml"
-    xpointer="xpointer(//*[@role='installation']/para[5])"/>
+    href="../../final-system/sparc/glibc.xml"
+    xpointer="xpointer(//*[@os='bd'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/glibc.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[2])"/>
+    href="../../final-system/sparc/glibc.xml"
+    xpointer="xpointer(//*[@os='be'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/x86/glibc.xml"
-    xpointer="xpointer(id('install-glibc')/para[4])"/>
+    href="../../final-system/sparc/glibc.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/x86/glibc.xml"
-    xpointer="xpointer(id('install-glibc')/screen[2])"/>
+    href="../../final-system/sparc/glibc.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
-<para>Next, prepare Glibc for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/sparc/glibc.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
 <screen><userinput>BUILD_CC="gcc" CC="${LFS_TARGET}-gcc" \
     AR="${LFS_TARGET}-ar" RANLIB="${LFS_TARGET}-ranlib" \
@@ -82,15 +88,15 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/glibc.xml"
-    xpointer="xpointer(//*[@role='installation']/para[5])"/>
+    xpointer="xpointer(//*[@os='df'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/glibc.xml"
-    xpointer="xpointer(//*[@role='installation']/blockquote[1])"/>
+    xpointer="xpointer(//*[@os='dg'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/glibc.xml"
-    xpointer="xpointer(//*[@role='installation']/para[6])"/>
+    xpointer="xpointer(//*[@os='dh'])"/>
 
     <para>Compile the package:</para>
 

Modified: branches/cross-lfs/BOOK/cross-tools/sparc64/glibc-64bit.xml
===================================================================
--- branches/cross-lfs/BOOK/cross-tools/sparc64/glibc-64bit.xml	2005-08-06 12:20:52 UTC (rev 6617)
+++ branches/cross-lfs/BOOK/cross-tools/sparc64/glibc-64bit.xml	2005-08-06 13:10:21 UTC (rev 6618)
@@ -44,39 +44,45 @@
     <title>Installation of Glibc</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/glibc.xml"
-    xpointer="xpointer(//*[@role='installation']/para[1])"/>
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='da'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/glibc.xml"
-    xpointer="xpointer(//*[@role='installation']/para[2])"/>
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='ba'])"/>
 
-    <para>We will disable the linking to libgcc_eh:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='db'])"/>
 
-<screen><userinput>patch -Np1 -i ../&glibc-libgcc_eh-patch;</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='dc'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/glibc.xml"
-    xpointer="xpointer(//*[@role='installation']/para[5])"/>
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='bd'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/glibc.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[2])"/>
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='be'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/x86/glibc.xml"
-    xpointer="xpointer(id('install-glibc')/para[4])"/>
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/x86/glibc.xml"
-    xpointer="xpointer(id('install-glibc')/screen[2])"/>
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
     <para>Now we make sure the Glibc goes into <filename
     class="directory">/tools/lib64</filename>:</para>
 
 <screen><userinput>echo "slibdir=/tools/lib64" >> configparms</userinput></screen>
 
-    <para>Next, prepare Glibc for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
 <screen><userinput>BUILD_CC="gcc" CC="${LFS_TARGET}-gcc ${BUILD64}" \
     AR="${LFS_TARGET}-ar" RANLIB="${LFS_TARGET}-ranlib" \
@@ -86,10 +92,6 @@
     --enable-kernel=2.6.0 --with-binutils=/cross-tools/bin \
     --with-headers=/tools/include</userinput></screen>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips64/glibc-64bit.xml"
-    xpointer="xpointer(//*[@role='installation']/variablelist[1])"/>
-
     <para>Compile the package:</para>
 
 <screen><userinput>make</userinput></screen>

Modified: branches/cross-lfs/BOOK/cross-tools/sparc64/glibc.xml
===================================================================
--- branches/cross-lfs/BOOK/cross-tools/sparc64/glibc.xml	2005-08-06 12:20:52 UTC (rev 6617)
+++ branches/cross-lfs/BOOK/cross-tools/sparc64/glibc.xml	2005-08-06 13:10:21 UTC (rev 6618)
@@ -45,33 +45,39 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/glibc.xml"
-    xpointer="xpointer(//*[@role='installation']/para[1])"/>
+    xpointer="xpointer(//*[@os='da'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/glibc.xml"
-    xpointer="xpointer(//*[@role='installation']/para[2])"/>
+    href="../../final-system/sparc64/glibc.xml"
+    xpointer="xpointer(//*[@os='ba'])"/>
 
-    <para>We will disable the linking to libgcc_eh:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='db'])"/>
 
-<screen><userinput>patch -Np1 -i ../&glibc-libgcc_eh-patch;</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='dc'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/glibc.xml"
-    xpointer="xpointer(//*[@role='installation']/para[5])"/>
+    href="../../final-system/sparc64/glibc.xml"
+    xpointer="xpointer(//*[@os='bd'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/glibc.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[2])"/>
+    href="../../final-system/sparc64/glibc.xml"
+    xpointer="xpointer(//*[@os='be'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/x86/glibc.xml"
-    xpointer="xpointer(id('install-glibc')/para[4])"/>
+    href="../../final-system/sparc64/glibc.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/x86/glibc.xml"
-    xpointer="xpointer(id('install-glibc')/screen[2])"/>
+    href="../../final-system/sparc64/glibc.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
-    <para>Next, prepare Glibc for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/sparc64/glibc.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
 <screen><userinput>BUILD_CC="gcc" CC="${LFS_TARGET}-gcc ${BUILD32}" \
     AR="${LFS_TARGET}-ar" RANLIB="${LFS_TARGET}-ranlib" \
@@ -83,15 +89,15 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/glibc.xml"
-    xpointer="xpointer(//*[@role='installation']/para[5])"/>
+    xpointer="xpointer(//*[@os='df'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/glibc.xml"
-    xpointer="xpointer(//*[@role='installation']/blockquote[1])"/>
+    xpointer="xpointer(//*[@os='dg'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/glibc.xml"
-    xpointer="xpointer(//*[@role='installation']/para[6])"/>
+    xpointer="xpointer(//*[@os='dh'])"/>
 
     <para>Compile the package:</para>
 

Modified: branches/cross-lfs/BOOK/cross-tools/x86/glibc-headers.xml
===================================================================
--- branches/cross-lfs/BOOK/cross-tools/x86/glibc-headers.xml	2005-08-06 12:20:52 UTC (rev 6617)
+++ branches/cross-lfs/BOOK/cross-tools/x86/glibc-headers.xml	2005-08-06 13:10:21 UTC (rev 6618)
@@ -45,13 +45,15 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/x86/glibc.xml"
-    xpointer="xpointer(id('install-glibc')/para[4])"/>
+    xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/x86/glibc.xml"
-    xpointer="xpointer(id('install-glibc')/screen[2])"/>
+    xpointer="xpointer(//*[@os='f'])"/>
 
-    <para>Next, prepare Glibc for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86/glibc.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
 <screen><userinput>CC=gcc ../glibc-&glibc-version;/configure --prefix=/tools \
     --host=${LFS_TARGET} --build=${LFS_HOST} \
@@ -59,7 +61,7 @@
     --with-headers=/tools/include \
     --with-binutils=/cross-tools/${LFS_TARGET}/bin</userinput></screen>
 
-    <variablelist>
+    <variablelist os="ca">
       <title>The meaning of the configure options:</title>
 
       <varlistentry>
@@ -126,28 +128,28 @@
 
     </variablelist>
 
-    <para>Now, install the headers:</para>
+    <para os="cb">Now, install the headers:</para>
 
-<screen><userinput>make install-headers</userinput></screen>
+<screen os="cd"><userinput>make install-headers</userinput></screen>
 
-    <para>Some files aren't installed by the above command, then
+    <para os="ce">Some files aren't installed by the above command, then
     we will copy the header files we need:</para>
 
-    <para>First we will copy a common file over to <filename
+    <para os="cf">First we will copy a common file over to <filename
     class="directory">/tools/include</filename>:</para>
 
-<screen><userinput>install -d /tools/include/bits
+<screen os="cg"><userinput>install -d /tools/include/bits
 cp bits/stdio_lim.h /tools/include/bits</userinput></screen>
 
-    <para>Now we will create a blank stub file:</para>
+    <para os="ch">Now we will create a blank stub file:</para>
 
-<screen><userinput>touch /tools/include/gnu/stubs.h</userinput></screen>
+<screen os="ci"><userinput>touch /tools/include/gnu/stubs.h</userinput></screen>
 
-    <para>For NPTL we use the following command:</para>
+    <para os="cj">For NPTL we use the following command:</para>
 
-<screen><userinput>cp ../glibc-&glibc-version;/nptl/sysdeps/pthread/pthread.h /tools/include/</userinput></screen>
+<screen os="ck"><userinput>cp ../glibc-&glibc-version;/nptl/sysdeps/pthread/pthread.h /tools/include/</userinput></screen>
 
-    <para>Now we copy the architecture specific header over:</para>
+    <para os="cl">Now we copy the architecture specific header over:</para>
 
 <screen><userinput>cp ../glibc-&glibc-version;/nptl/sysdeps/unix/sysv/linux/i386/bits/pthreadtypes.h /tools/include/bits/</userinput></screen>
 

Modified: branches/cross-lfs/BOOK/cross-tools/x86/glibc.xml
===================================================================
--- branches/cross-lfs/BOOK/cross-tools/x86/glibc.xml	2005-08-06 12:20:52 UTC (rev 6617)
+++ branches/cross-lfs/BOOK/cross-tools/x86/glibc.xml	2005-08-06 13:10:21 UTC (rev 6618)
@@ -43,28 +43,32 @@
   <sect2 role="installation">
     <title>Installation of Glibc</title>
 
-    <para>It should be noted that compiling Glibc in any way other than
+    <para os="da">It should be noted that compiling Glibc in any way other than
     the method suggested in this book puts the stability of the system at
     risk.</para>
 
-    <para>We will disable the linking to libgcc_eh:</para>
+    <para os="db">We will disable the linking to
+    <filename>libgcc_eh</filename>:</para>
 
-<screen><userinput>patch -Np1 -i ../&glibc-libgcc_eh-patch;</userinput></screen>
+<screen os="dc"><userinput>patch -Np1 -i ../&glibc-libgcc_eh-patch;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/x86/glibc.xml"
-    xpointer="xpointer(id('install-glibc')/para[4])"/>
+    xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/x86/glibc.xml"
-    xpointer="xpointer(id('install-glibc')/screen[2])"/>
+    xpointer="xpointer(//*[@os='f'])"/>
 
-    <para> For NPTL enabled systems we will need to add the following lines to config.cache:</para>
+    <para os="dd"> For NPTL enabled systems we will need to add the following lines to
+    <filename>config.cache</filename>:</para>
 
-<screen><userinput>echo "libc_cv_forced_unwind=yes" > config.cache
+<screen os="de"><userinput>echo "libc_cv_forced_unwind=yes" > config.cache
 echo "libc_cv_c_cleanup=yes" >> config.cache</userinput></screen>
 
-    <para>Next, prepare Glibc for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86/glibc.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
 <screen><userinput>BUILD_CC="gcc" CC="${LFS_TARGET}-gcc" \
     AR="${LFS_TARGET}-ar" RANLIB="${LFS_TARGET}-ranlib" \
@@ -75,15 +79,15 @@
     --with-binutils=/cross-tools/bin --with-headers=/tools/include \
     --cache-file=config.cache</userinput></screen>
 
-    <para>During this stage the following warning might appear:</para>
+    <para os="df">During this stage the following warning might appear:</para>
 
-<blockquote><screen><computeroutput>configure: WARNING:
+<blockquote os="dg"><screen><computeroutput>configure: WARNING:
 *** These auxiliary programs are missing or
 *** incompatible versions: msgfmt
 *** some features will be disabled.
 *** Check the INSTALL file for required versions.</computeroutput></screen></blockquote>
 
-    <para>The missing or incompatible <command>msgfmt</command> program is
+    <para os="dh">The missing or incompatible <command>msgfmt</command> program is
     generally harmless. This <command>msgfmt</command> program is part of the
     Gettext package which the host distribution should provide.</para>
 

Modified: branches/cross-lfs/BOOK/cross-tools/x86_64/glibc-64bit.xml
===================================================================
--- branches/cross-lfs/BOOK/cross-tools/x86_64/glibc-64bit.xml	2005-08-06 12:20:52 UTC (rev 6617)
+++ branches/cross-lfs/BOOK/cross-tools/x86_64/glibc-64bit.xml	2005-08-06 13:10:21 UTC (rev 6618)
@@ -44,32 +44,41 @@
     <title>Installation of Glibc</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/glibc.xml"
-    xpointer="xpointer(//*[@role='installation']/para[1])"/>
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='da'])"/>
 
-    <para>We will disable the linking to libgcc_eh:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='db'])"/>
 
-<screen><userinput>patch -Np1 -i ../&glibc-libgcc_eh-patch;</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='dc'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/x86/glibc.xml"
-    xpointer="xpointer(id('install-glibc')/para[4])"/>
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/x86/glibc.xml"
-    xpointer="xpointer(id('install-glibc')/screen[2])"/>
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
-    <para> For NPTL enabled systems we will need to add the following lines to config.cache:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='dd'])"/>
 
-<screen><userinput>echo "libc_cv_forced_unwind=yes" > config.cache
-echo "libc_cv_c_cleanup=yes" >> config.cache</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='de'])"/>
 
     <para>Now we make sure the Glibc goes into <filename
     class="directory">/tools/lib64</filename>:</para>
 
 <screen><userinput>echo "slibdir=/tools/lib64" >> configparms</userinput></screen>
 
-    <para>Next, prepare Glibc for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
 <screen><userinput>BUILD_CC="gcc" CC="${LFS_TARGET}-gcc ${BUILD64}" \
     AR="${LFS_TARGET}-ar" RANLIB="${LFS_TARGET}-ranlib" \
@@ -80,10 +89,6 @@
     --with-binutils=/cross-tools/bin --with-headers=/tools/include \
     --cache-file=config.cache</userinput></screen>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips64/glibc-64bit.xml"
-    xpointer="xpointer(//*[@role='installation']/variablelist[1])"/>
-
     <para>Compile the package:</para>
 
 <screen><userinput>make</userinput></screen>

Modified: branches/cross-lfs/BOOK/cross-tools/x86_64/glibc-headers.xml
===================================================================
--- branches/cross-lfs/BOOK/cross-tools/x86_64/glibc-headers.xml	2005-08-06 12:20:52 UTC (rev 6617)
+++ branches/cross-lfs/BOOK/cross-tools/x86_64/glibc-headers.xml	2005-08-06 13:10:21 UTC (rev 6618)
@@ -44,14 +44,16 @@
     <title>Installation of Glibc Headers</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/x86/glibc.xml"
-    xpointer="xpointer(id('install-glibc')/para[4])"/>
+    href="../../final-system/x86_64/glibc.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/x86/glibc.xml"
-    xpointer="xpointer(id('install-glibc')/screen[2])"/>
+    href="../../final-system/x86_64/glibc.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
-    <para>Next, prepare Glibc for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86_64/glibc.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
 <screen><userinput>CC=gcc ../glibc-&glibc-version;/configure --prefix=/tools \
     --host=${LFS_TARGET} --build=${LFS_HOST} \
@@ -61,47 +63,47 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/glibc-headers.xml"
-    xpointer="xpointer(//*[@role='installation']/variablelist[1])"/>
+    xpointer="xpointer(//*[@os='ca'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/glibc-headers.xml"
-    xpointer="xpointer(//*[@role='installation']/para[3])"/>
+    xpointer="xpointer(//*[@os='cb'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/glibc-headers.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[3])"/>
+    xpointer="xpointer(//*[@os='cd'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/glibc-headers.xml"
-    xpointer="xpointer(//*[@role='installation']/para[4])"/>
+    xpointer="xpointer(//*[@os='ce'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/glibc-headers.xml"
-    xpointer="xpointer(//*[@role='installation']/para[5])"/>
+    xpointer="xpointer(//*[@os='cf'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/glibc-headers.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[4])"/>
+    xpointer="xpointer(//*[@os='cg'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/glibc-headers.xml"
-    xpointer="xpointer(//*[@role='installation']/para[6])"/>
+    xpointer="xpointer(//*[@os='ch'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/glibc-headers.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[5])"/>
+    xpointer="xpointer(//*[@os='ci'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/glibc-headers.xml"
-    xpointer="xpointer(//*[@role='installation']/para[7])"/>
+    xpointer="xpointer(//*[@os='cj'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/glibc-headers.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[6])"/>
+    xpointer="xpointer(//*[@os='ck'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/glibc-headers.xml"
-    xpointer="xpointer(//*[@role='installation']/para[8])"/>
+    xpointer="xpointer(//*[@os='cl'])"/>
 
 <screen><userinput>cp ../glibc-&glibc-version;/nptl/sysdeps/unix/sysv/linux/x86_64/bits/pthreadtypes.h /tools/include/bits/</userinput></screen>
 

Modified: branches/cross-lfs/BOOK/cross-tools/x86_64/glibc.xml
===================================================================
--- branches/cross-lfs/BOOK/cross-tools/x86_64/glibc.xml	2005-08-06 12:20:52 UTC (rev 6617)
+++ branches/cross-lfs/BOOK/cross-tools/x86_64/glibc.xml	2005-08-06 13:10:21 UTC (rev 6618)
@@ -45,26 +45,35 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/glibc.xml"
-    xpointer="xpointer(//*[@role='installation']/para[1])"/>
+    xpointer="xpointer(//*[@os='da'])"/>
 
-    <para>We will disable the linking to libgcc_eh:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='db'])"/>
 
-<screen><userinput>patch -Np1 -i ../&glibc-libgcc_eh-patch;</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='dc'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/x86/glibc.xml"
-    xpointer="xpointer(id('install-glibc')/para[4])"/>
+    href="glibc-headers.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/x86/glibc.xml"
-    xpointer="xpointer(id('install-glibc')/screen[2])"/>
+    href="glibc-headers.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
-    <para> For NPTL enabled systems we will need to add the following lines to config.cache:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='dd'])"/>
 
-<screen><userinput>echo "libc_cv_forced_unwind=yes" > config.cache
-echo "libc_cv_c_cleanup=yes" >> config.cache</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc.xml"
+    xpointer="xpointer(//*[@os='de'])"/>
 
-    <para>Next, prepare Glibc for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="glibc-headers.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
 <screen><userinput>BUILD_CC="gcc" CC="${LFS_TARGET}-gcc ${BUILD32}" \
     AR="${LFS_TARGET}-ar" RANLIB="${LFS_TARGET}-ranlib" \
@@ -77,15 +86,15 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/glibc.xml"
-    xpointer="xpointer(//*[@role='installation']/para[5])"/>
+    xpointer="xpointer(//*[@os='df'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/glibc.xml"
-    xpointer="xpointer(//*[@role='installation']/blockquote[1])"/>
+    xpointer="xpointer(//*[@os='dg'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/glibc.xml"
-    xpointer="xpointer(//*[@role='installation']/para[6])"/>
+    xpointer="xpointer(//*[@os='dh'])"/>
 
     <para>Compile the package:</para>
 




More information about the lfs-book mailing list