Changeset d7f1a52

Timestamp:

Jun 5, 2009, 10:50:56 PM (15 years ago)

Author:

Jim Gifford <clfs@…>

Branches:

clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

f8177ee

Parents:

6861354

Message:

Reverted back to 5010. GCC Fixincludes changes

Location:

BOOK

Files:

• cross-tools/common/gcc-final.xml (modified) (1 diff)
• cross-tools/common/gcc-static.xml (modified) (1 diff)
• introduction/common/changelog.xml (modified) (1 diff)

BOOK/cross-tools/common/gcc-final.xml

@@ -63 +63 @@
     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@-c true@' gcc/Makefile.in.orig > gcc/Makefile.in</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

BOOK/cross-tools/common/gcc-static.xml

@@ -56 +56 @@
 sed -e "s@\(^CROSS_SYSTEM_HEADER_DIR =\).*@\1 /tools/include@g" \
     gcc/Makefile.in.orig &gt; 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@-c true@' gcc/Makefile.in.orig > gcc/Makefile.in</userinput></screen>
 
     <para os="t1">We will create a dummy <filename>limits.h</filename> so

BOOK/introduction/common/changelog.xml

@@ -57 +57 @@
         <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>