[lfs-fr] r1396 - in trunk/clfs: . boot/common cross-tools cross-tools/mips cross-tools/mips64 cross-tools/mips64-64 cross-tools/x86_64 final-system final-system/mips final-system/mips64-64 final-system/multilib introduction/common introduction/mips introduction/mips64 introduction/mips64-64 materials/common materials/mips materials/mips64 materials/mips64-64 prologue/common stylesheets/lfs-xsl temp-system temp-system/common temp-system/mips temp-system/mips64 temp-system/mips64-64

jmengual at linuxfromscratch.org jmengual at linuxfromscratch.org
Mar 9 Aou 17:54:46 PDT 2011


Author: jmengual
Date: 2011-08-10 02:54:46 +0200 (Wed, 10 Aug 2011)
New Revision: 1396

Added:
   trunk/clfs/final-system/mips/gcc.xml
   trunk/clfs/temp-system/common/.gcc.xml.swp
Removed:
   trunk/clfs/cross-tools/x86_64/gcc-final.xml
Modified:
   trunk/clfs/boot/common/devices.xml
   trunk/clfs/cross-tools/mips-chapter.xml
   trunk/clfs/cross-tools/mips/gcc-final.xml
   trunk/clfs/cross-tools/mips/gcc-static.xml
   trunk/clfs/cross-tools/mips64-64/gcc-final.xml
   trunk/clfs/cross-tools/mips64-64/gcc-static.xml
   trunk/clfs/cross-tools/mips64-chapter.xml
   trunk/clfs/cross-tools/mips64/gcc-final.xml
   trunk/clfs/cross-tools/mips64/gcc-static.xml
   trunk/clfs/final-system/mips-chapter.xml
   trunk/clfs/final-system/mips64-64-chapter.xml
   trunk/clfs/final-system/mips64-64/gcc.xml
   trunk/clfs/final-system/multilib/pkg-config.xml
   trunk/clfs/final-system/multilib/util-linux.xml
   trunk/clfs/general.ent
   trunk/clfs/introduction/common/acknowledgements.xml
   trunk/clfs/introduction/common/changelog.xml
   trunk/clfs/introduction/common/how.xml
   trunk/clfs/introduction/mips/changelog.xml
   trunk/clfs/introduction/mips64-64/changelog.xml
   trunk/clfs/introduction/mips64/changelog.xml
   trunk/clfs/materials/common/packages.xml
   trunk/clfs/materials/common/patches.xml
   trunk/clfs/materials/mips/patches.xml
   trunk/clfs/materials/mips64-64/patches.xml
   trunk/clfs/materials/mips64/patches.xml
   trunk/clfs/packages.ent
   trunk/clfs/patches.ent
   trunk/clfs/prologue/common/foreword.xml
   trunk/clfs/prologue/common/hostreqs.xml
   trunk/clfs/stylesheets/lfs-xsl/lfs.css
   trunk/clfs/temp-system/mips-chapter.xml
   trunk/clfs/temp-system/mips/gcc.xml
   trunk/clfs/temp-system/mips64-64-chapter.xml
   trunk/clfs/temp-system/mips64-64/gcc.xml
   trunk/clfs/temp-system/mips64/gcc.xml
Log:
Mise a jour. Reste une petite erreur xml a corriger dans stylesheets/top-index.xsl.
Merci a celui qui trouvera le probleme.



Modified: trunk/clfs/boot/common/devices.xml
===================================================================
--- trunk/clfs/boot/common/devices.xml	2011-08-07 23:00:48 UTC (rev 1395)
+++ trunk/clfs/boot/common/devices.xml	2011-08-10 00:54:46 UTC (rev 1396)
@@ -19,9 +19,9 @@
 
     <note os="a">
       <para>Vous devriez exécuter  les commandes  du reste de ce livre en  tant qu'utilisateur
-      <systemitem class="username">root</systemitem>. En outre, vérifiez 
-      doublement que ${CLFS} est configuré par
-      <systemitem class="username">root</systemitem>.</para>
+      <systemitem class="username">root</systemitem>. Vérifiez que ${CLFS} est 
+      configuré dans l'environnement de l'utilisateur 
+      <systemitem class="username">root</systemitem> avant de continuer.</para>
     </note>
 
     <para os="b">Quand le noyau démarre le système, il exige la présence de quelques nœds de périphérique, en 

Modified: trunk/clfs/cross-tools/mips/gcc-final.xml
===================================================================
--- trunk/clfs/cross-tools/mips/gcc-final.xml	2011-08-07 23:00:48 UTC (rev 1395)
+++ trunk/clfs/cross-tools/mips/gcc-final.xml	2011-08-10 00:54:46 UTC (rev 1396)
@@ -12,7 +12,7 @@
 
   <indexterm zone="ch-cross-tools-gcc-final">
     <primary sortas="a-GCC">GCC</primary>
-    <secondary>outils croisés, final</secondary>
+    <secondary>cross tools, final</secondary>
   </indexterm>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -20,27 +20,17 @@
   xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
-    <title>Installation de GCC Cross Compiler</title>
+    <title>Installation of GCC Cross Compiler</title>
 
-<!--
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="gcc-static.xml"
     xpointer="xpointer(//*[@os='p1'])"/>
-
+    
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="gcc-static.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
--->
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="gcc-static.xml"
     xpointer="xpointer(//*[@os='aa'])"/>
 
@@ -50,22 +40,14 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
-
+    xpointer="xpointer(//*[@os='f1'])"/>
+    
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
+    xpointer="xpointer(//*[@os='f2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='af'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="gcc-static.xml"
     xpointer="xpointer(//*[@os='ag'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -92,14 +74,36 @@
     href="gcc-static.xml"
     xpointer="xpointer(//*[@os='h'])"/>
 
+
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gcc-final.xml"
     xpointer="xpointer(//*[@os='bf'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bg'])"/>
+    <variablelist os="bg">
+      <title>The meaning of the new configure options:</title>
 
+      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../common/gcc-final.xml"
+      xpointer="xpointer(//*[@os='bg1'])"/>
+
+      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../common/gcc-final.xml"
+      xpointer="xpointer(//*[@os='bg2'])"/>
+
+      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../common/gcc-final.xml"
+      xpointer="xpointer(//*[@os='bg3'])"/>
+
+      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../common/gcc-final.xml"
+      xpointer="xpointer(//*[@os='bg4'])"/>
+
+      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../common/gcc-final.xml"
+      xpointer="xpointer(//*[@os='bg5'])"/>
+
+    </variablelist>
+
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gcc-final.xml"
     xpointer="xpointer(//*[@os='bh'])"/>
@@ -111,7 +115,6 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gcc-final.xml"
     xpointer="xpointer(//*[@os='bj'])"/>
-    <para>Continue with compiling the package:</para>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gcc-final.xml"
@@ -122,7 +125,7 @@
   <sect2 role="content">
     <title/>
 
-    <para>Les détails sur ce paquet sont situés dans <xref
+    <para>Details on this package are located in <xref
     linkend="contents-gcc" role="."/></para>
 
   </sect2>

Modified: trunk/clfs/cross-tools/mips/gcc-static.xml
===================================================================
--- trunk/clfs/cross-tools/mips/gcc-static.xml	2011-08-07 23:00:48 UTC (rev 1395)
+++ trunk/clfs/cross-tools/mips/gcc-static.xml	2011-08-10 00:54:46 UTC (rev 1396)
@@ -12,7 +12,7 @@
 
   <indexterm zone="ch-cross-tools-gcc-static">
     <primary sortas="a-GCC">GCC</primary>
-    <secondary>outils croisés, static</secondary>
+    <secondary>cross tools, static</secondary>
   </indexterm>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -20,58 +20,53 @@
   xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
-    <title>Installation de Cross GCC Compiler with Static libgcc
+    <title>Installation of Cross GCC Compiler with Static libgcc
     and no Threads</title>
 
-<!--
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gcc-static.xml"
     xpointer="xpointer(//*[@os='p1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
+    href="../64/gcc-static.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
--->
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gcc-static.xml"
     xpointer="xpointer(//*[@os='aa'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
+    href="../64/gcc-static.xml"
     xpointer="xpointer(//*[@os='ab'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
+    <para os="f1">The following patch fixes and issue that causes GCC
+    to segfault when compilling for Mips.</para>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
+    <screen os="f2"><userinput>patch -Np1 -i ../&gcc-mips-fix-patch;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
+    xpointer="xpointer(//*[@os='ag'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='af'])"/>
+    xpointer="xpointer(//*[@os='ah'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ag'])"/>
+    xpointer="xpointer(//*[@os='ai'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ah'])"/>
+    xpointer="xpointer(//*[@os='aj'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ai'])"/>
+    xpointer="xpointer(//*[@os='t1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aj'])"/>
+    xpointer="xpointer(//*[@os='t2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/gcc.xml"
@@ -114,7 +109,7 @@
   <sect2 role="content">
     <title/>
 
-    <para>Les détails sur ce paquet sont situés dans <xref
+    <para>Details on this package are located in <xref
     linkend="contents-gcc" role="."/></para>
 
   </sect2>

Modified: trunk/clfs/cross-tools/mips-chapter.xml
===================================================================
--- trunk/clfs/cross-tools/mips-chapter.xml	2011-08-07 23:00:48 UTC (rev 1395)
+++ trunk/clfs/cross-tools/mips-chapter.xml	2011-08-10 00:54:46 UTC (rev 1396)
@@ -24,8 +24,8 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ppl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/cloog-ppl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/binutils-32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gcc-static.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/gcc-static.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/eglibc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gcc-final.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/gcc-final.xml"/>
 
 </chapter>

Modified: trunk/clfs/cross-tools/mips64/gcc-final.xml
===================================================================
--- trunk/clfs/cross-tools/mips64/gcc-final.xml	2011-08-07 23:00:48 UTC (rev 1395)
+++ trunk/clfs/cross-tools/mips64/gcc-final.xml	2011-08-10 00:54:46 UTC (rev 1396)
@@ -12,7 +12,7 @@
 
   <indexterm zone="ch-cross-tools-gcc-final">
     <primary sortas="a-GCC">GCC</primary>
-    <secondary>outils croisés, final</secondary>
+    <secondary>cross tools, final</secondary>
   </indexterm>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -20,9 +20,8 @@
   xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
-    <title>Installation de GCC Cross Compiler</title>
+    <title>Installation of GCC Cross Compiler</title>
 
-<!--
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="gcc-static.xml"
     xpointer="xpointer(//*[@os='p1'])"/>
@@ -30,17 +29,8 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="gcc-static.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
--->
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="gcc-static.xml"
     xpointer="xpointer(//*[@os='aa'])"/>
 
@@ -50,22 +40,14 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
-
+    xpointer="xpointer(//*[@os='f1'])"/>
+    
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
+    xpointer="xpointer(//*[@os='f2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='af'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="gcc-static.xml"
     xpointer="xpointer(//*[@os='ag'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -81,14 +63,6 @@
     xpointer="xpointer(//*[@os='aj'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bd'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64/gcc-final.xml"
-    xpointer="xpointer(//*[@os='be'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="gcc-static.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
@@ -101,7 +75,7 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64/gcc-final.xml"
+    href="../multilib/gcc-final.xml"
     xpointer="xpointer(//*[@os='bf'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -129,7 +103,7 @@
   <sect2 role="content">
     <title/>
 
-    <para>Les détails sur ce paquet sont situés dans <xref
+    <para>Details on this package are located in <xref
     linkend="contents-gcc" role="."/></para>
 
   </sect2>

Modified: trunk/clfs/cross-tools/mips64/gcc-static.xml
===================================================================
--- trunk/clfs/cross-tools/mips64/gcc-static.xml	2011-08-07 23:00:48 UTC (rev 1395)
+++ trunk/clfs/cross-tools/mips64/gcc-static.xml	2011-08-10 00:54:46 UTC (rev 1396)
@@ -12,7 +12,7 @@
 
   <indexterm zone="ch-cross-tools-gcc-static">
     <primary sortas="a-GCC">GCC</primary>
-    <secondary>outils croisés, static</secondary>
+    <secondary>cross tools, static</secondary>
   </indexterm>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -20,10 +20,9 @@
   xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
-    <title>Installation de Cross GCC Compiler with Static libgcc
+    <title>Installation of Cross GCC Compiler with Static libgcc
     and no Threads</title>
 
-<!--
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gcc-static.xml"
     xpointer="xpointer(//*[@os='p1'])"/>
@@ -31,7 +30,6 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gcc-static.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
--->
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gcc-static.xml"
@@ -42,36 +40,36 @@
     xpointer="xpointer(//*[@os='ab'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
-
+    href="../mips/gcc-static.xml"
+    xpointer="xpointer(//*[@os='f1'])"/>
+    
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
+    href="../mips/gcc-static.xml"
+    xpointer="xpointer(//*[@os='f2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
+    xpointer="xpointer(//*[@os='ag'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='af'])"/>
+    href="../ppc/gcc-static.xml"
+    xpointer="xpointer(//*[@os='ah'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ag'])"/>
+    xpointer="xpointer(//*[@os='ai'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ah'])"/>
+    xpointer="xpointer(//*[@os='aj'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ai'])"/>
+    xpointer="xpointer(//*[@os='t1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aj'])"/>
+    xpointer="xpointer(//*[@os='t2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/gcc.xml"
@@ -86,7 +84,7 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64/gcc-static.xml"
+    href="../multilib/gcc-static.xml"
     xpointer="xpointer(//*[@os='al'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -114,7 +112,7 @@
   <sect2 role="content">
     <title/>
 
-    <para>Les détails sur ce paquet sont situés dans <xref
+    <para>Details on this package are located in <xref
     linkend="contents-gcc" role="."/></para>
 
   </sect2>

Modified: trunk/clfs/cross-tools/mips64-64/gcc-final.xml
===================================================================
--- trunk/clfs/cross-tools/mips64-64/gcc-final.xml	2011-08-07 23:00:48 UTC (rev 1395)
+++ trunk/clfs/cross-tools/mips64-64/gcc-final.xml	2011-08-10 00:54:46 UTC (rev 1396)
@@ -25,12 +25,11 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="gcc-static.xml"
     xpointer="xpointer(//*[@os='p1'])"/>
-    
+
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="gcc-static.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
 
-
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="gcc-static.xml"
     xpointer="xpointer(//*[@os='aa'])"/>
@@ -41,6 +40,14 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="gcc-static.xml"
+    xpointer="xpointer(//*[@os='f1'])"/>
+    
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="gcc-static.xml"
+    xpointer="xpointer(//*[@os='f2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="gcc-static.xml"
     xpointer="xpointer(//*[@os='ag'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -74,7 +81,8 @@
   --enable-shared --enable-languages=c,c++ --enable-__cxa_atexit \
   --with-mpfr=/cross-tools --with-gmp=/cross-tools --enable-c99 \
   --with-ppl=/cross-tools --with-cloog=/cross-tools \
-  --enable-long-long --enable-threads=posix --with-abi=64</userinput></screen>
+  --enable-long-long --enable-threads=posix --with-abi=64\
+  --disable-multilib</userinput></screen>
 
     <variablelist os="bg">
       <title>The meaning of the new configure options:</title>

Modified: trunk/clfs/cross-tools/mips64-64/gcc-static.xml
===================================================================
--- trunk/clfs/cross-tools/mips64-64/gcc-static.xml	2011-08-07 23:00:48 UTC (rev 1395)
+++ trunk/clfs/cross-tools/mips64-64/gcc-static.xml	2011-08-10 00:54:46 UTC (rev 1396)
@@ -40,6 +40,14 @@
     xpointer="xpointer(//*[@os='ab'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../mips/gcc-static.xml"
+    xpointer="xpointer(//*[@os='f1'])"/>
+    
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../mips/gcc-static.xml"
+    xpointer="xpointer(//*[@os='f2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gcc-static.xml"
     xpointer="xpointer(//*[@os='ag'])"/>
 
@@ -83,7 +91,8 @@
   --with-ppl=/cross-tools --with-cloog=/cross-tools \
   --without-headers --with-newlib --disable-decimal-float \
   --disable-libgomp --disable-libmudflap --disable-libssp \
-  --disable-threads --enable-languages=c --with-abi=64</userinput></screen>
+  --disable-threads --enable-languages=c --with-abi=64\
+  --disable-multilib</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gcc-static.xml"

Modified: trunk/clfs/cross-tools/mips64-chapter.xml
===================================================================
--- trunk/clfs/cross-tools/mips64-chapter.xml	2011-08-07 23:00:48 UTC (rev 1395)
+++ trunk/clfs/cross-tools/mips64-chapter.xml	2011-08-10 00:54:46 UTC (rev 1396)
@@ -25,10 +25,10 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ppl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/cloog-ppl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gcc-static.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/gcc-static.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/eglibc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/eglibc-n32.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/eglibc-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gcc-final.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/gcc-final.xml"/>
 
 </chapter>

Deleted: trunk/clfs/cross-tools/x86_64/gcc-final.xml
===================================================================
--- trunk/clfs/cross-tools/x86_64/gcc-final.xml	2011-08-07 23:00:48 UTC (rev 1395)
+++ trunk/clfs/cross-tools/x86_64/gcc-final.xml	2011-08-10 00:54:46 UTC (rev 1396)
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-gcc-final" role="wrap">
-  <?dbhtml filename="gcc-final.html"?>
-
-  <title>GCC-&gcc-version; croisé - Fin</title>
-
-  <indexterm zone="ch-cross-tools-gcc-final">
-    <primary sortas="a-GCC">GCC</primary>
-    <secondary>outils croisés, final</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/gcc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation du compilateur croisé GCC</title>
-
-    <xi:include xmlns:xi="~http://www.w3.org/2001/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="~http://www.w3.org/2001/XInclude"
-     href="gcc-static.xml"
-      xpointer="xpointer(//*[@os='p2'])"/>
-      
-<!--
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='af'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ag'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ah'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ai'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='aj'])"/>
-
-    <para os="bd">Finally, disable <option>-B</option> in
-    <filename>configure</filename> so wrong architecture libraries are not
-    picked up, as -B is not expanded by the multilib spec:</para>
-
-<screen os="be"><userinput>cp -v configure{,.orig}
-sed -e  '/FLAGS_FOR_TARGET.*\/lib\//s at -B[^ ]*/lib/@@g' configure.orig > \
-    configure</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-<screen os="bf"><userinput>AR=ar LDFLAGS="-Wl,-rpath,/cross-tools/lib" \
-    ../gcc-&gcc-version;/configure --prefix=/cross-tools \
-    --build=${CLFS_HOST} --target=${CLFS_TARGET} --host=${CLFS_HOST} \
-    --with-local-prefix=/tools --disable-nls \
-    --with-mpfr=/cross-tools --with-gmp=/cross-tools \
-    --enable-shared --enable-languages=c,c++ --enable-__cxa_atexit \
-    --enable-c99 --enable-long-long --enable-threads=posix</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bg'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bh'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bi'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bk'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Les détails sur ce paquet sont situés dans <xref
-    linkend="contents-gcc" role="."/></para>
-
-  </sect2>
-
-</sect1>

Added: trunk/clfs/final-system/mips/gcc.xml
===================================================================
--- trunk/clfs/final-system/mips/gcc.xml	                        (rev 0)
+++ trunk/clfs/final-system/mips/gcc.xml	2011-08-10 00:54:46 UTC (rev 1396)
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-system-gcc" role="wrap">
+  <?dbhtml filename="gcc.html"?>
+
+  <title>GCC-&gcc-version;</title>
+
+  <indexterm zone="ch-system-gcc">
+    <primary sortas="a-GCC">GCC</primary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/gcc.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of GCC</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../cross-tools/mips/gcc-static.xml"
+    xpointer="xpointer(//*[@os='f1'])"/>
+    
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../cross-tools/mips/gcc-static.xml"
+    xpointer="xpointer(//*[@os='f2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='l'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='m'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='n'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='o'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='p'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='q'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='r'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='s'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='t'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='u'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='v'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='w'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='x'])"/>
+
+  </sect2>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/gcc.xml"
+  xpointer="xpointer(id('contents-gcc'))"/>
+
+</sect1>

Modified: trunk/clfs/final-system/mips-chapter.xml
===================================================================
--- trunk/clfs/final-system/mips-chapter.xml	2011-08-07 23:00:48 UTC (rev 1395)
+++ trunk/clfs/final-system/mips-chapter.xml	2011-08-10 00:54:46 UTC (rev 1396)
@@ -26,7 +26,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/cloog-ppl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/zlib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gcc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/gcc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/glib.xml"/>

Modified: trunk/clfs/final-system/mips64-64/gcc.xml
===================================================================
--- trunk/clfs/final-system/mips64-64/gcc.xml	2011-08-07 23:00:48 UTC (rev 1395)
+++ trunk/clfs/final-system/mips64-64/gcc.xml	2011-08-10 00:54:46 UTC (rev 1396)
@@ -19,9 +19,8 @@
   xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
-    <title>Installation de GCC</title>
+    <title>Installation of GCC</title>
 
-<!--
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gcc.xml"
     xpointer="xpointer(//*[@os='p1'])"/>
@@ -29,23 +28,21 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gcc.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
--->
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
+    <para os="p5">Apply the following patch so that GCC links to
+    <filename class="directory">/lib</filename> instead of
+    <filename class="directory">/lib64</filename>:</para>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../64/gcc.xml"
-    xpointer="xpointer(//*[@os='p5'])"/>
+<screen os="p6"><userinput>patch -Np1 -i ../&gcc-pure64-patch;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../64/gcc.xml"
-    xpointer="xpointer(//*[@os='p6'])"/>
+    href="../../cross-tools/mips/gcc-static.xml"
+    xpointer="xpointer(//*[@os='f1'])"/>
+    
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../cross-tools/mips/gcc-static.xml"
+    xpointer="xpointer(//*[@os='f2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gcc.xml"
@@ -57,14 +54,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='e1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='e2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -75,11 +64,9 @@
     href="../common/gcc.xml"
     xpointer="xpointer(//*[@os='h'])"/>
 
-<screen os="i"><userinput>../gcc-&gcc-version;/configure --prefix=/usr \
-    --libexecdir=/usr/lib --enable-shared --enable-threads=posix \
-    --enable-__cxa_atexit --enable-c99 --enable-long-long --with-abi=64 \
-    --enable-clocale=gnu --enable-languages=c,c++ --disable-libstdcxx-pch \
-    --disable-multilib</userinput></screen>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gcc.xml"

Modified: trunk/clfs/final-system/mips64-64-chapter.xml
===================================================================
--- trunk/clfs/final-system/mips64-64-chapter.xml	2011-08-07 23:00:48 UTC (rev 1395)
+++ trunk/clfs/final-system/mips64-64-chapter.xml	2011-08-10 00:54:46 UTC (rev 1396)
@@ -26,7 +26,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/cloog-ppl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/zlib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/gcc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64-64/gcc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/glib.xml"/>

Modified: trunk/clfs/final-system/multilib/pkg-config.xml
===================================================================
--- trunk/clfs/final-system/multilib/pkg-config.xml	2011-08-07 23:00:48 UTC (rev 1395)
+++ trunk/clfs/final-system/multilib/pkg-config.xml	2011-08-10 00:54:46 UTC (rev 1396)
@@ -75,7 +75,7 @@
     <para os="m3">Export these variables to prevent any issues in the
     future.</para>
 
-<screen os="m4"><userinput>cat >> ${CLFS}/root/.bash_profile << EOF
+<screen os="m4"><userinput>cat >> /root/.bash_profile << EOF
 export PKG_CONFIG_PATH32="${PKG_CONFIG_PATH32}"
 export PKG_CONFIG_PATH64="${PKG_CONFIG_PATH64}"
 EOF</userinput></screen>

Modified: trunk/clfs/final-system/multilib/util-linux.xml
===================================================================
--- trunk/clfs/final-system/multilib/util-linux.xml	2011-08-07 23:00:48 UTC (rev 1395)
+++ trunk/clfs/final-system/multilib/util-linux.xml	2011-08-10 00:54:46 UTC (rev 1396)
@@ -8,7 +8,7 @@
 <sect1 id="ch-system-util-linux-ng-32" role="wrap">
   <?dbhtml filename="util-linux-ng.html"?>
 
-  <title>Bibliothèques Util-linux-&util-linux-version;</title>
+  <title>Util-linux-&util-linux-version; 32 bits</title>
 
   <indexterm zone="ch-system-util-linux-ng-32">
     <primary sortas="a-Util-linux-ng">Bibliothèques Util-linux-ng 32 bits</primary>

Modified: trunk/clfs/general.ent
===================================================================
--- trunk/clfs/general.ent	2011-08-07 23:00:48 UTC (rev 1395)
+++ trunk/clfs/general.ent	2011-08-10 00:54:46 UTC (rev 1396)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<!ENTITY month "06"> <!-- Use two digits -->
-<!ENTITY month_name "juin">
-<!ENTITY day "18"> <!-- Use two digits -->
+<!ENTITY month "07"> <!-- Use two digits -->
+<!ENTITY month_name "juillet">
+<!ENTITY day "13"> <!-- Use two digits -->
 <!ENTITY year "2011"> <!-- Use four digits -->
 
 <!ENTITY releasedate "&month_name; &day;, &year;">
@@ -10,7 +10,7 @@
 <!ENTITY major-version "1">
 <!ENTITY minor-version "2">
 <!ENTITY extra-version "0">
-<!ENTITY generic-version "git"> <!-- Use "svn", "testing", or "x.y.z[-pre{x}]" -->
+<!ENTITY generic-version "git"> <!-- Use "git", "testing", or "x.y.z[-pre{x}]" -->
 
 <!ENTITY version "GIT-&year;&month;&day;">
 
@@ -35,9 +35,9 @@
 <!ENTITY clfs-wiki "http://trac.cross-lfs.org/">
 <!ENTITY cblfs-root "http://cblfs.cross-lfs.org/">
 <!ENTITY faq-root "&clfs-wiki;wiki/faq">
-<!ENTITY hints-root "http://hints.cross-lfs.org/">
+<!ENTITY hints-root "http://hints.cross-lfs.org/index.php/">
 <!ENTITY livecd-root "&lfs-root;livecd/">
-<!ENTITY test-results "&clfs-root;testsuite-logs/clfs-&generic-version;/">
+<!ENTITY test-results "&clfs-root;testsuite-logs/&generic-version;/">
 <!ENTITY errata "&clfs-wiki;clfs/errata/&generic-version;/">
 
 <!ENTITY gnu "http://ftp.gnu.org/gnu/">
@@ -47,9 +47,9 @@
 <!ENTITY kernel "http://www.kernel.org/pub/">
 <!ENTITY sourceforge "http://downloads.sourceforge.net/">
 
-<!ENTITY dependencies "L'installation dépend de">
-<!ENTITY testsuites "La suite de test dépend de">
-<!ENTITY before "Doivent être installés avant">
+<!ENTITY dependencies "L'installation dépend de">
+<!ENTITY testsuites "La suite de tests dépend de">
+<!ENTITY before "Doit être installé avant">
 
 <!ENTITY % packages-entities SYSTEM "packages.ent">
 %packages-entities;
@@ -59,4 +59,3 @@
 
 <!ENTITY % uid-gid-entities SYSTEM "users_groups.ent">
 %uid-gid-entities;
-

Modified: trunk/clfs/introduction/common/acknowledgements.xml
===================================================================
--- trunk/clfs/introduction/common/acknowledgements.xml	2011-08-07 23:00:48 UTC (rev 1395)
+++ trunk/clfs/introduction/common/acknowledgements.xml	2011-08-10 00:54:46 UTC (rev 1396)
@@ -45,6 +45,9 @@
       <para>Karen McGuiness - Relecteur.</para>
     </listitem>
     <listitem>
+      <para>Jonathan Norman - x86, x86_64, PowerPC & UltraSPARC.</para>
+    </listitem>
+    <listitem>
       <para>Jeremy Huntwork - constructions de PowerPC, x86, Sparc.</para>
     </listitem>
     <listitem>

Modified: trunk/clfs/introduction/common/changelog.xml
===================================================================
--- trunk/clfs/introduction/common/changelog.xml	2011-08-07 23:00:48 UTC (rev 1395)
+++ trunk/clfs/introduction/common/changelog.xml	2011-08-10 00:54:46 UTC (rev 1396)
@@ -37,6 +37,37 @@
     </listitem>
 
 -->
+    <listitem>
+      <para>3 juillet 2011</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Jonathan] - Suppression d'une variable redondante de pkg-config, 
+          merci à db m.</para>
+        </listitem>
+        <listitem>
+          <para>[Jonathan] - Added Glib to package list, thanks db m.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+ <listitem>
+      <para>22 juin 2011</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Jonathan] - Suppression de la référence et effacement du correctif 
+          CLooG-PPL.</para>
+        </listitem>
+        <listitem>
+          <para>[Jonathan] - Correction des liens de téléchargement d'Util-Linux 
+          et de Patch.</para>
+        </listitem>
+        <listitem>
+          <para>[Jonathan] - Correction des sommes de contrôle MD5 de divers 
+         correctifs et paquets.</para>
+        </listitem>
+       </itemizedlist>
+     </listitem>
+
      <listitem>
       <para>18 juin 2011</para>
       <itemizedlist>

Modified: trunk/clfs/introduction/common/how.xml
===================================================================
--- trunk/clfs/introduction/common/how.xml	2011-08-07 23:00:48 UTC (rev 1395)
+++ trunk/clfs/introduction/common/how.xml	2011-08-10 00:54:46 UTC (rev 1396)
@@ -20,16 +20,12 @@
   la distribution pour disposer de ces outils.</para>
 
   <para>Alternativement à l'installation d'une distribution séparée
-  complète sur votre machine, vous pouvez utiliser le LiveCD Linux From
-  Scratch ou le LiveCD d'une distribution commerciale. Le CD 
-  fonctionne en tant que système hôte, fournissant
-  tous les outils dont vous avez besoin pour suivre les instructions de
-  ce livre avec succès. Il contient les sources des paquets et les correctifs pour le bivre LFS et une copie du livre LFS, mais pas les 
-  paquets ou le livre pour CLFS. Vous pouvez toujours utiliser le CD pour la construction de CLFS, mais vous aurez besoin de télécharger les 
-  paquets, les correctifs et le livre séparément. Vous pouvez aussi regarder
-  <ulink url="&hints-root;lfscd-remastering-howto.txt"/>  pour des informations sur la construction de votre propre CD, pour remplacer les 
-  paquets de LFS et le livre par ceux pour CLFS. Une fois que vous avez le CD, aucune connexion réseau ou téléchargements supplémentaires 
-  est nécessaire. Pour plus d'informations sur le LiveCD LFS ou pour en télécharger une copie, visitez <ulink url="&livecd-root;"/>.</para>
+  complète sur votre machine, vous pouvez utiliser un LiveCD. La plupart des
+  distribution offrent un LiveCD, qui fournissent un environnement sur lequel
+  vous pouvez ajouter les outils nécessaires, ce qui vous permet de suivre
+  sans problèmes les instructions de ce livre. Souvenez-vous que si vous
+  redémarrez le liveCD, vous devrez reconfigurer l'environnement hôte avant de
+  continuer votre construction.</para>
 
   <para>Le <xref linkend="chapter-partitioning"/> de ce livre décrit comment créer
   une nouvelle partition native Linux et un système de fichiers,

Modified: trunk/clfs/introduction/mips/changelog.xml
===================================================================
--- trunk/clfs/introduction/mips/changelog.xml	2011-08-07 23:00:48 UTC (rev 1395)
+++ trunk/clfs/introduction/mips/changelog.xml	2011-08-10 00:54:46 UTC (rev 1396)
@@ -8,7 +8,7 @@
 <sect1 id="ch-intro-changelog-mips">
   <?dbhtml filename="changelog-mips.html"?>
 
-  <title>Changelog for MIPS 32 bit</title>
+  <title>Changelog for MIPS 32 Bit</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../x86/changelog.xml"
@@ -34,6 +34,15 @@
 -->
 
     <listitem>
+      <para>July 13, 2011</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Jonathan] - Added Mips-fix patch to resolve GCC segfault issue.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>November 21, 2006</para>
       <itemizedlist>
         <listitem>

Modified: trunk/clfs/introduction/mips64/changelog.xml
===================================================================
--- trunk/clfs/introduction/mips64/changelog.xml	2011-08-07 23:00:48 UTC (rev 1395)
+++ trunk/clfs/introduction/mips64/changelog.xml	2011-08-10 00:54:46 UTC (rev 1396)
@@ -34,6 +34,16 @@
 -->
 
     <listitem>
+      <para>July 13, 2011</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Jonathan] - Added Mips-fix patch to resolve GCC segfault issue.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+
+    <listitem>
       <para>June 15, 2011</para>
       <itemizedlist>
         <listitem>

Modified: trunk/clfs/introduction/mips64-64/changelog.xml
===================================================================
--- trunk/clfs/introduction/mips64-64/changelog.xml	2011-08-07 23:00:48 UTC (rev 1395)
+++ trunk/clfs/introduction/mips64-64/changelog.xml	2011-08-10 00:54:46 UTC (rev 1396)
@@ -34,6 +34,15 @@
 -->
 
     <listitem>
+      <para>July 13, 2011</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Jonathan] - Added Mips-fix patch to resolve GCC segfault issue.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>June 02, 2008</para>
       <itemizedlist>
         <listitem>

Modified: trunk/clfs/materials/common/packages.xml
===================================================================
--- trunk/clfs/materials/common/packages.xml	2011-08-07 23:00:48 UTC (rev 1395)
+++ trunk/clfs/materials/common/packages.xml	2011-08-10 00:54:46 UTC (rev 1396)
@@ -222,6 +222,15 @@
     </varlistentry>
 
     <varlistentry>
+      <term>Glib (&glib-version;) - <token>&glib-size;</token> :</term>
+      <listitem>
+        <para>Page d'accueil : <ulink url="&glib-home;"/></para>
+        <para>Téléchargement : <ulink url="&glib-url;"/></para>
+        <para>Somme de contrôle MD5 : <literal>&glib-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
       <term>GMP (&gmp-version;) - <token>&gmp-size;</token> :</term>
       <listitem>
         <para>Page d'accueil : <ulink url="&gmp-home;"/></para>

Modified: trunk/clfs/materials/common/patches.xml
===================================================================
--- trunk/clfs/materials/common/patches.xml	2011-08-07 23:00:48 UTC (rev 1395)
+++ trunk/clfs/materials/common/patches.xml	2011-08-10 00:54:46 UTC (rev 1396)
@@ -29,15 +29,6 @@
       </listitem>
     </varlistentry>
 
-     <varlistentry>
-      <term>CLooG-PPL correctif Autogen - <token>&cloog-ppl-autogen-patch-size;</token> :</term>
-      <listitem>
-        <para>Téléchargement : <ulink
-        url="&patches-root;&cloog-ppl-autogen-patch;"/></para>
-        <para>Somme de contrôle MD5 : <literal>&cloog-ppl-autogen-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
     <varlistentry>
       <term>Coreutils Correctif Uname - <token>&coreutils-uname-patch-size;</token> :</term>
       <listitem>

Modified: trunk/clfs/materials/mips/patches.xml
===================================================================
--- trunk/clfs/materials/mips/patches.xml	2011-08-07 23:00:48 UTC (rev 1395)
+++ trunk/clfs/materials/mips/patches.xml	2011-08-10 00:54:46 UTC (rev 1396)
@@ -14,21 +14,30 @@
 
     <varlistentry os="colo-relocation-patch">
       <term>Colo Relocation Patch - <token>&colo-relocation-patch-size;</token>:</term> <listitem>
-        <para>Téléchargement : <ulink
+        <para>Download: <ulink
         url="&patches-root;&colo-relocation-patch;"/></para>
-        <para>Somme de contrôle MD5 : <literal>&colo-relocation-patch-md5;</literal></para>
+        <para>MD5 sum: <literal>&colo-relocation-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
 
     <varlistentry os="dvhtool-fixes-patch">
       <term>Dvhtool Fixes - <token>&dvhtool-fixes-patch-size;</token>:</term>
       <listitem>
-        <para>Téléchargement : <ulink
+        <para>Download: <ulink
         url="&patches-root;&dvhtool-fixes-patch;"/></para>
-        <para>Somme de contrôle MD5 : <literal>&dvhtool-fixes-patch-md5;</literal></para>
+        <para>MD5 sum: <literal>&dvhtool-fixes-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
 
+    <varlistentry os="gcc-mips-fix-patch">
+      <term>GCC Mips Fix - <token>&gcc-mips-fix-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink
+        url="&patches-root;&gcc-mips-fix-patch;"/></para>
+        <para>MD5 sum: <literal>&gcc-mips-fix-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../x86/patches.xml"
     xpointer="xpointer(//*[@os='gcc-specs-patch'])"/>

Modified: trunk/clfs/materials/mips64/patches.xml
===================================================================
--- trunk/clfs/materials/mips64/patches.xml	2011-08-07 23:00:48 UTC (rev 1395)
+++ trunk/clfs/materials/mips64/patches.xml	2011-08-10 00:54:46 UTC (rev 1396)
@@ -29,6 +29,10 @@
     xpointer="xpointer(//*[@os='dvhtool-fixes-patch'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../mips/patches.xml"
+    xpointer="xpointer(//*[@os='gcc-mips-fix-patch'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../x86/patches.xml"
     xpointer="xpointer(//*[@os='gcc-specs-patch'])"/>
 

Modified: trunk/clfs/materials/mips64-64/patches.xml
===================================================================
--- trunk/clfs/materials/mips64-64/patches.xml	2011-08-07 23:00:48 UTC (rev 1395)
+++ trunk/clfs/materials/mips64-64/patches.xml	2011-08-10 00:54:46 UTC (rev 1396)
@@ -8,7 +8,7 @@
 <sect1 id="ch-materials-patches-mips64">
   <?dbhtml filename="patches-mips64.html"?>
 
-  <title>Additional Patches for MIPS 64 bits</title>
+  <title>Additional Patches for MIPS 64 Bit</title>
 
   <variablelist role="materials">
 
@@ -21,6 +21,10 @@
     xpointer="xpointer(//*[@os='dvhtool-fixes-patch'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../mips/patches.xml"
+    xpointer="xpointer(//*[@os='gcc-mips-fix-patch'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../x86_64-64/patches.xml"
     xpointer="xpointer(//*[@os='gcc-pure64-patch'])"/>
 

Modified: trunk/clfs/packages.ent
===================================================================
--- trunk/clfs/packages.ent	2011-08-07 23:00:48 UTC (rev 1395)
+++ trunk/clfs/packages.ent	2011-08-10 00:54:46 UTC (rev 1396)
@@ -330,7 +330,7 @@
 
 <!ENTITY patch-version "2.6.1">
 <!ENTITY patch-size "248 Kio">
-<!ENTITY patch-url "&gnu;patch/patch-&patch-version;.tar.gz">
+<!ENTITY patch-url "&gnu;patch/patch-&patch-version;.tar.bz2">
 <!ENTITY patch-md5 "0818d1763ae0c4281bcdc63cdac0b2c0">
 <!ENTITY patch-home "http://savannah.gnu.org/projects/patch">
 
@@ -439,8 +439,8 @@
 <!ENTITY uname_hack-home " ">
 
 <!ENTITY util-linux-dl-version "2.16">
-<!ENTITY util-linux-major-version "2.19.1">
-<!ENTITY util-linux-version "&util-linux-major-version;">
+<!ENTITY util-linux-major-version "2.19">
+<!ENTITY util-linux-version "&util-linux-major-version;.1">
 <!ENTITY util-linux-size "4,397 Kio">
 <!ENTITY util-linux-url "&kernel;linux/utils/util-linux/v&util-linux-major-version;/util-linux-&util-linux-version;.tar.bz2">
 <!ENTITY util-linux-md5 "3eab06f05163dfa65479c44e5231932c">

Modified: trunk/clfs/patches.ent
===================================================================
--- trunk/clfs/patches.ent	2011-08-07 23:00:48 UTC (rev 1395)
+++ trunk/clfs/patches.ent	2011-08-10 00:54:46 UTC (rev 1396)
@@ -8,10 +8,6 @@
 <!ENTITY bash-branch_update-patch-md5 "6aef48cfd93b9109358eae0be9125946">
 <!ENTITY bash-branch_update-patch-size "16 Kio">
 
-<!ENTITY cloog-ppl-autogen-patch "cloog-ppl-&cloog-ppl-version;-autogen-1.patch">
-<!ENTITY cloog-ppl-autogen-patch-md5 "7e571071c0105f012bbe41f97f8d1da8">
-<!ENTITY cloog-ppl-autogen-patch-size "624 KB">
-
 <!ENTITY coreutils-uname-patch "coreutils-&coreutils-version;-uname-1.patch">
 <!ENTITY coreutils-uname-patch-md5 "683741cb2c4ab60cf9b61eb9f02ecd02">
 <!ENTITY coreutils-uname-patch-size "8 Kio">
@@ -57,7 +53,7 @@
 <!ENTITY ncurses-branch_update-patch-size "796 Kio">
 
 <!ENTITY perl-libc-patch "perl-&perl-version;-libc-1.patch">
-<!ENTITY perl-libc-patch-md5 "d572b0cc87b35f1806fd84f88803fb66">
+<!ENTITY perl-libc-patch-md5 "6efb1ffa5a6961c239024c445e0adc9a">
 <!ENTITY perl-libc-patch-size "4 Kio">
 
 <!ENTITY procps-fix_HZ_errors-patch "procps-&procps-version;-fix_HZ_errors-1.patch">
@@ -91,7 +87,7 @@
 <!-- Start of multilib patches -->
 
 <!ENTITY iproute2-libdir-patch "iproute2-&iproute2-version;-libdir-1.patch">
-<!ENTITY iproute2-libdir-patch-md5 "7abb69b57dc2a5caa481b1798c1d7fc9">
+<!ENTITY iproute2-libdir-patch-md5 "b901c549615739b28db8b4a2126049ce">
 <!ENTITY iproute2-libdir-patch-size "4 Kio">
 
 <!ENTITY perl-multilib-patch "perl-&perl-version;-Configure_multilib-1.patch">
@@ -132,6 +128,10 @@
 <!ENTITY dvhtool-fixes-patch-md5 "a521b380354b6a0c96b2d6308372749d">
 <!ENTITY dvhtool-fixes-patch-size "6 Kio">
 
+<!ENTITY gcc-mips-fix-patch "gcc-&gcc-version;-mips_fix-1.patch">
+<!ENTITY gcc-mips-fix-patch-md5 "abf4b55165bb44508d1f8f36188c9e90">
+<!ENTITY gcc-mips-fix-patch-size "8 Kio">
+
 <!-- Start of ppc/ppc64 patches -->
 
 <!ENTITY gcc-nof-patch "gcc-&gcc-version;-powerpc64_multilib-1.patch">

Modified: trunk/clfs/prologue/common/foreword.xml
===================================================================
--- trunk/clfs/prologue/common/foreword.xml	2011-08-07 23:00:48 UTC (rev 1395)
+++ trunk/clfs/prologue/common/foreword.xml	2011-08-10 00:54:46 UTC (rev 1396)
@@ -42,7 +42,8 @@
 Jeremy Utley, gestionnaire de la version 1.x de CLFS (auteur de la Page)
 Jim Gifford, Co-leader du projet CLFS
 Ryan Oliver, Co-leader du projet CLFS
-Joe Ciccone, Justin Knierim, Chris Staub, Matt Darcy, Ken Moffat,
+Joe Ciccone, Co-leader du projet CLFS
+Jonathan Norman, Justin Knierim, Chris Staub, Matt Darcy, Ken Moffat,
 Manuel Canales Esparcia et Nathan Coulson - Dévelopeurs CLFS</literallayout>
 
 </sect1>

Modified: trunk/clfs/prologue/common/hostreqs.xml
===================================================================
--- trunk/clfs/prologue/common/hostreqs.xml	2011-08-07 23:00:48 UTC (rev 1395)
+++ trunk/clfs/prologue/common/hostreqs.xml	2011-08-10 00:54:46 UTC (rev 1396)
@@ -117,7 +117,7 @@
 find --version | head -n1
 gawk --version | head -n1
 gcc --version | head -n1
-/lib/libc.so.6 | head -n1 | cut -d" " -f1-7
+$(find /lib{,64} -name libc.so.6) | head -n1 | cut -d" " -f1-7
 grep --version | head -n1
 gzip --version | head -n1
 uname -s -r

Modified: trunk/clfs/stylesheets/lfs-xsl/lfs.css
===================================================================
--- trunk/clfs/stylesheets/lfs-xsl/lfs.css	2011-08-07 23:00:48 UTC (rev 1395)
+++ trunk/clfs/stylesheets/lfs-xsl/lfs.css	2011-08-10 00:54:46 UTC (rev 1396)
@@ -46,6 +46,7 @@
 /* Sections */
 div.sect1, div.appendix {
   padding-left: .3em;
+  text-align: justify;
 }
 
 .package, .kernel, .installation, .commands, .testing, .configuration, .content {
@@ -522,6 +523,7 @@
   padding: .5em 1em;
   margin: 0 2em .5em 2em;
   font-weight: bold;
+  overflow: auto;
 }
 
 pre.userinput {

Added: trunk/clfs/temp-system/common/.gcc.xml.swp
===================================================================
(Binary files differ)


Property changes on: trunk/clfs/temp-system/common/.gcc.xml.swp
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: trunk/clfs/temp-system/mips/gcc.xml
===================================================================
--- trunk/clfs/temp-system/mips/gcc.xml	2011-08-07 23:00:48 UTC (rev 1395)
+++ trunk/clfs/temp-system/mips/gcc.xml	2011-08-10 00:54:46 UTC (rev 1396)
@@ -12,7 +12,7 @@
 
   <indexterm zone="ch-temp-system-gcc">
     <primary sortas="a-GCC">GCC</primary>
-    <secondary>système temporaire</secondary>
+    <secondary>temporary system</secondary>
   </indexterm>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -20,60 +20,42 @@
   xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
-    <title>Installation de GCC</title>
+    <title>Installation of GCC</title>
 
-<!--
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../cross-tools/mips/gcc-static.xml"
+    href="../../cross-tools/common/gcc-static.xml"
     xpointer="xpointer(//*[@os='p1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../cross-tools/mips/gcc-static.xml"
+    href="../../cross-tools/common/gcc-static.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
--->
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../cross-tools/mips/gcc-static.xml"
+    href="../../cross-tools/common/gcc-static.xml"
     xpointer="xpointer(//*[@os='aa'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../cross-tools/mips/gcc-static.xml"
+    href="../../cross-tools/common/gcc-static.xml"
     xpointer="xpointer(//*[@os='ab'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../cross-tools/mips/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
-
+    xpointer="xpointer(//*[@os='f1'])"/>
+    
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../cross-tools/mips/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
+    xpointer="xpointer(//*[@os='f2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../cross-tools/mips/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
+    href="../../cross-tools/common/gcc-static.xml"
+    xpointer="xpointer(//*[@os='ag'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../cross-tools/mips/gcc-static.xml"
-    xpointer="xpointer(//*[@os='af'])"/>
+    href="../../cross-tools/common/gcc-static.xml"
+    xpointer="xpointer(//*[@os='ah'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cd'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='ce'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
     xpointer="xpointer(//*[@os='cf'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -106,6 +88,14 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='ts1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='ts2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc.xml"
     xpointer="xpointer(//*[@os='cm'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -125,7 +115,7 @@
   <sect2 role="content">
     <title/>
 
-    <para>Les détails sur ce paquet sont situés dans <xref
+    <para>Details on this package are located in <xref
     linkend="contents-gcc" role="."/></para>
 
   </sect2>

Modified: trunk/clfs/temp-system/mips-chapter.xml
===================================================================
--- trunk/clfs/temp-system/mips-chapter.xml	2011-08-07 23:00:48 UTC (rev 1395)
+++ trunk/clfs/temp-system/mips-chapter.xml	2011-08-10 00:54:46 UTC (rev 1396)
@@ -20,7 +20,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/cloog-ppl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/zlib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gcc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/gcc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bison.xml"/>

Modified: trunk/clfs/temp-system/mips64/gcc.xml
===================================================================
--- trunk/clfs/temp-system/mips64/gcc.xml	2011-08-07 23:00:48 UTC (rev 1395)
+++ trunk/clfs/temp-system/mips64/gcc.xml	2011-08-10 00:54:46 UTC (rev 1396)
@@ -39,6 +39,14 @@
     xpointer="xpointer(//*[@os='ab'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../cross-tools/mips/gcc-static.xml"
+    xpointer="xpointer(//*[@os='f1'])"/>
+    
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../cross-tools/mips/gcc-static.xml"
+    xpointer="xpointer(//*[@os='f2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../cross-tools/multilib/gcc-static.xml"
     xpointer="xpointer(//*[@os='ag'])"/>
 

Modified: trunk/clfs/temp-system/mips64-64/gcc.xml
===================================================================
--- trunk/clfs/temp-system/mips64-64/gcc.xml	2011-08-07 23:00:48 UTC (rev 1395)
+++ trunk/clfs/temp-system/mips64-64/gcc.xml	2011-08-10 00:54:46 UTC (rev 1396)
@@ -12,7 +12,7 @@
 
   <indexterm zone="ch-temp-system-gcc">
     <primary sortas="a-GCC">GCC</primary>
-    <secondary>système temporaire</secondary>
+    <secondary>temporary system</secondary>
   </indexterm>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -20,60 +20,42 @@
   xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
-    <title>Installation de GCC</title>
+    <title>Installation of GCC</title>
 
-<!--
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../cross-tools/mips64-64/gcc-static.xml"
+    href="../../cross-tools/64/gcc-static.xml"
     xpointer="xpointer(//*[@os='p1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../cross-tools/mips64-64/gcc-static.xml"
+    href="../../cross-tools/64/gcc-static.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
--->
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../cross-tools/mips64-64/gcc-static.xml"
+    href="../../cross-tools/64/gcc-static.xml"
     xpointer="xpointer(//*[@os='aa'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../cross-tools/mips64-64/gcc-static.xml"
+    href="../../cross-tools/64/gcc-static.xml"
     xpointer="xpointer(//*[@os='ab'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../cross-tools/mips64-64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
-
+    href="../../cross-tools/mips/gcc-static.xml"
+    xpointer="xpointer(//*[@os='f1'])"/>
+    
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../cross-tools/mips64-64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
+    href="../../cross-tools/mips/gcc-static.xml"
+    xpointer="xpointer(//*[@os='f2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../cross-tools/mips64-64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
+    href="../../cross-tools/64/gcc-static.xml"
+    xpointer="xpointer(//*[@os='ag'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../cross-tools/mips64-64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='af'])"/>
+    href="../../cross-tools/64/gcc-static.xml"
+    xpointer="xpointer(//*[@os='ah'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cd'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='ce'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
     xpointer="xpointer(//*[@os='cf'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -81,14 +63,6 @@
     xpointer="xpointer(//*[@os='cg'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64/gcc.xml"
-    xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64/gcc.xml"
-    xpointer="xpointer(//*[@os='db'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/gcc.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
@@ -107,7 +81,7 @@
 <screen os="ck"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
     ../gcc-&gcc-version;/configure --prefix=/tools --disable-multilib \
     --build=${CLFS_HOST} --host=${CLFS_TARGET} --target=${CLFS_TARGET} \
-    --with-local-prefix=/tools --enable-long-long --with-abi=64 \
+    --libexecdir=/tools/lib --with-local-prefix=/tools --enable-long-long \
     --enable-c99 --enable-shared --enable-threads=posix --disable-nls \
     --enable-__cxa_atexit --enable-languages=c,c++ --disable-libstdcxx-pch</userinput></screen>
 
@@ -115,7 +89,7 @@
       <title>The meaning of the new configure options:</title>
 
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../x86_64/gcc.xml"
+      href="../multilib/gcc.xml"
       xpointer="xpointer(//*[@os='dd1'])"/>
 
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -126,6 +100,14 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='ts1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='ts2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc.xml"
     xpointer="xpointer(//*[@os='cm'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -140,20 +122,12 @@
     href="../common/gcc.xml"
     xpointer="xpointer(//*[@os='cp'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64-64/gcc.xml"
-    xpointer="xpointer(//*[@os='dp'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64-64/gcc.xml"
-    xpointer="xpointer(//*[@os='dq'])"/>
-
   </sect2>
 
   <sect2 role="content">
     <title/>
 
-    <para>Les détails sur ce paquet sont situés dans <xref
+    <para>Details on this package are located in <xref
     linkend="contents-gcc" role="."/></para>
 
   </sect2>

Modified: trunk/clfs/temp-system/mips64-64-chapter.xml
===================================================================
--- trunk/clfs/temp-system/mips64-64-chapter.xml	2011-08-07 23:00:48 UTC (rev 1395)
+++ trunk/clfs/temp-system/mips64-64-chapter.xml	2011-08-10 00:54:46 UTC (rev 1396)
@@ -20,7 +20,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/cloog-ppl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/zlib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/gcc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64-64/gcc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bash.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bison.xml"/>




More information about the lfs-traducfr mailing list