r1665 - in branches/clfs-2.0/BOOK: cross-tools/common final-system/common

jciccone at linuxfromscratch.org jciccone at linuxfromscratch.org
Fri May 26 18:15:11 PDT 2006


Author: jciccone
Date: 2006-05-26 19:15:08 -0600 (Fri, 26 May 2006)
New Revision: 1665

Modified:
   branches/clfs-2.0/BOOK/cross-tools/common/binutils.xml
   branches/clfs-2.0/BOOK/cross-tools/common/gcc-final.xml
   branches/clfs-2.0/BOOK/cross-tools/common/gcc-static.xml
   branches/clfs-2.0/BOOK/final-system/common/binutils.xml
   branches/clfs-2.0/BOOK/final-system/common/gcc.xml
Log:
Added the posix patches to the final-system binutils and gcc. Changed some sed commands to not use -i and fixed a typo in the gcc instructions.

Modified: branches/clfs-2.0/BOOK/cross-tools/common/binutils.xml
===================================================================
--- branches/clfs-2.0/BOOK/cross-tools/common/binutils.xml	2006-05-27 00:16:29 UTC (rev 1664)
+++ branches/clfs-2.0/BOOK/cross-tools/common/binutils.xml	2006-05-27 01:15:08 UTC (rev 1665)
@@ -27,10 +27,13 @@
     linker and assembler to determine which of their own features to
     enable.</para>
 
-    <para os="ba">To make sure that the proper syntax is used for a couple of
-    tools, apply the following patch:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/binutils.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
 
-<screen os="bb"><userinput>patch -Np1 -i ../&binutils-posix-patch;</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/binutils.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/binutils.xml"

Modified: branches/clfs-2.0/BOOK/cross-tools/common/gcc-final.xml
===================================================================
--- branches/clfs-2.0/BOOK/cross-tools/common/gcc-final.xml	2006-05-27 00:16:29 UTC (rev 1664)
+++ branches/clfs-2.0/BOOK/cross-tools/common/gcc-final.xml	2006-05-27 01:15:08 UTC (rev 1665)
@@ -31,12 +31,12 @@
     xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
+    href="../../final-system/common/gcc.xml"
+    xpointer="xpointer(//*[@os='p3'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
+    href="../../final-system/common/gcc.xml"
+    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="gcc-static.xml"

Modified: branches/clfs-2.0/BOOK/cross-tools/common/gcc-static.xml
===================================================================
--- branches/clfs-2.0/BOOK/cross-tools/common/gcc-static.xml	2006-05-27 00:16:29 UTC (rev 1664)
+++ branches/clfs-2.0/BOOK/cross-tools/common/gcc-static.xml	2006-05-27 01:15:08 UTC (rev 1665)
@@ -23,10 +23,13 @@
     <title>Installation of Cross GCC Compiler with Static libgcc
     and no Threads</title>
 
-    <para os="aa">To make sure that a couple of tools use the proper syntax,
-    apply the following patch:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/gcc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
 
-<screen os="ab"><userinput>patch -Np1 -i ../&gcc-posix-patch;</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/gcc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <para os="ac">The following patch ensures that <command>gcc</command> does not
     search the <filename class="directory">/usr</filename> directory for

Modified: branches/clfs-2.0/BOOK/final-system/common/binutils.xml
===================================================================
--- branches/clfs-2.0/BOOK/final-system/common/binutils.xml	2006-05-27 00:16:29 UTC (rev 1664)
+++ branches/clfs-2.0/BOOK/final-system/common/binutils.xml	2006-05-27 01:15:08 UTC (rev 1665)
@@ -25,6 +25,11 @@
   <sect2 role="installation">
     <title>Installation of Binutils</title>
 
+    <para os="p1">To make sure that the proper syntax is used for a couple of
+    tools, apply the following patch:</para>
+
+<screen os="p2"><userinput>patch -Np1 -i ../&binutils-posix-patch;</userinput></screen>
+
     <para os="a">The Binutils documentation recommends building Binutils outside of the
     source directory in a dedicated build directory:</para>
 

Modified: branches/clfs-2.0/BOOK/final-system/common/gcc.xml
===================================================================
--- branches/clfs-2.0/BOOK/final-system/common/gcc.xml	2006-05-27 00:16:29 UTC (rev 1664)
+++ branches/clfs-2.0/BOOK/final-system/common/gcc.xml	2006-05-27 01:15:08 UTC (rev 1665)
@@ -25,17 +25,23 @@
   <sect2 role="installation">
     <title>Installation of GCC</title>
 
-    <para os="p1">The following patch fixes the searching of multilib dirs for
+    <para os="p1">To make sure that a couple of tools use the proper syntax,
+    apply the following patch:</para>
+
+<screen os="p2"><userinput>patch -Np1 -i ../gcc-4.1.1-posix-1.patch</userinput></screen>
+
+    <para os="p3">The following patch fixes the searching of multilib dirs for
     specs file:</para>
 
-<screen os="p2"><userinput>patch -Np1 -i ../&gcc-PR20425-patch;</userinput></screen>
+<screen os="p4"><userinput>patch -Np1 -i ../&gcc-PR20425-patch;</userinput></screen>
 
     <para os="a">Apply a <command>sed</command> substitution that will suppress the
     installation of <filename class="libraryfile">libiberty.a</filename>. The
     version of <filename class="libraryfile">libiberty.a</filename> provided by
     Binutils will be used instead:</para>
 
-<screen os="b"><userinput>sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in</userinput></screen>
+<screen os="b"><userinput>cp libiberty/Makefile.in{,.orig}
+sed 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in.orig > libiberty/Makefile.in</userinput></screen>
 
     <para os="e1">GCC provides a <command>gccbug</command> script which detects at
     compile time whether mktemp is present, and hardcodes the result in a test.
@@ -43,7 +49,8 @@
     random names for temporary files.  We will be installing mktemp
     later, so the following sed will simulate its presence:</para>
 
-<screen os="e2"><userinput>sed -i 's/@have_mktemp_command@/yes/' gcc/gccbug.in</userinput></screen>
+<screen os="e2"><userinput>cp gcc/gccbug.in{,.orig}
+sed 's/@have_mktemp_command@/yes/' gcc/gccbug.in.orig > gcc/gccbug.in</userinput></screen>
 
     <para os="c">The GCC documentation recommends building GCC outside of the source
     directory in a dedicated build directory:</para>
@@ -53,7 +60,7 @@
 
     <para os="e">Prepare GCC for compilation:</para>
 
-<screen os="f"><userinput>../gcc-4.1.0/configure --prefix=/usr --libexecdir=/usr/lib \
+<screen os="f"><userinput>../gcc-&gcc-version;/configure --prefix=/usr --libexecdir=/usr/lib \
     --build=${LFS_HOST} --host=${LFS_TARGET} --target=${LFS_TARGET} \
     --enable-shared --enable-threads=posix --enable-__cxa_atexit \
     --enable-c99 --enable-long-long --enable-clocale=gnu \




More information about the cross-lfs mailing list