[Clfs-commits] commit: r5013 - in /trunk/BOOK: cross-tools/common/gcc-final.xml cross-tools/common/gcc-static.xml introduction/common/changelog.xml

[svn at cross-lfs.org]

Author: jim
Date: Sat Jun  6 05:50:56 2009
New Revision: 5013

Log:
Reverted back to 5010. GCC Fixincludes changes

Modified:
    trunk/BOOK/cross-tools/common/gcc-final.xml
    trunk/BOOK/cross-tools/common/gcc-static.xml
    trunk/BOOK/introduction/common/changelog.xml

Modified: trunk/BOOK/cross-tools/common/gcc-final.xml
==============================================================================
--- trunk/BOOK/cross-tools/common/gcc-final.xml (original)
+++ trunk/BOOK/cross-tools/common/gcc-final.xml Sat Jun  6 05:50:56 2009
@@ -62,13 +62,11 @@
     href="gcc-static.xml"
     xpointer="xpointer(//*[@os='aj'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
+    <para os="gcf1">Now we will prevent gcc from running the fixincludes script, so 
+    it doesn't modify any of the headers we have installed:</para>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
+<screen os="gcf2"><userinput>cp -v gcc/Makefile.in{,.orig}
+sed -e 's@\./fixinc\.sh at -c true@' gcc/Makefile.in.orig > gcc/Makefile.in</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="gcc-static.xml"

Modified: trunk/BOOK/cross-tools/common/gcc-static.xml
==============================================================================
--- trunk/BOOK/cross-tools/common/gcc-static.xml (original)
+++ trunk/BOOK/cross-tools/common/gcc-static.xml Sat Jun  6 05:50:56 2009
@@ -55,12 +55,6 @@
 <screen os="aj"><userinput>cp -v gcc/Makefile.in{,.orig}
 sed -e "s@\(^CROSS_SYSTEM_HEADER_DIR =\).*@\1 /tools/include at g" \
     gcc/Makefile.in.orig > gcc/Makefile.in</userinput></screen>
-
-    <para os="s1">Now we will prevent gcc from running the fixincludes script, so
-    it doesn't modify any of the headers we have installed:</para>
-
-<screen os="s2"><userinput>cp -v gcc/Makefile.in{,.orig}
-sed -e 's@\./fixinc\.sh at -c true@' gcc/Makefile.in.orig > gcc/Makefile.in</userinput></screen>
 
     <para os="t1">We will create a dummy <filename>limits.h</filename> so
     the build will not use the one provided by the host distro:</para>

Modified: trunk/BOOK/introduction/common/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/common/changelog.xml (original)
+++ trunk/BOOK/introduction/common/changelog.xml Sat Jun  6 05:50:56 2009
@@ -56,13 +56,6 @@
         </listitem>
         <listitem>
           <para>[Jim] - Updated VIM Branch Update Patch to -15.</para>
-        </listitem>
-        <listitem>
-          <para>[Jim] - Added sed to Cross-Tools Section gcc-final to prevent
-          the running of GCC's fixincludes script.</para>
-        </listitem>
-        <listitem>
-          <para>[Jim] - Expanded sed to Cross-Tools Section gcc-static.</para>
         </listitem>
       </itemizedlist>
     </listitem>