[lfs-book] r9850 - in trunk/BOOK: . chapter01 chapter05 chapter06

matthew at linuxfromscratch.org matthew at linuxfromscratch.org
Fri May 11 05:27:53 PDT 2012


Author: matthew
Date: 2012-05-11 06:27:48 -0600 (Fri, 11 May 2012)
New Revision: 9850

Modified:
   trunk/BOOK/chapter01/changelog.xml
   trunk/BOOK/chapter05/gcc-pass2.xml
   trunk/BOOK/chapter06/gcc.xml
   trunk/BOOK/general.ent
Log:
Run fixincludes again, by removing the sed that disabled it.  It no longer attempts to fix up host headers.

Modified: trunk/BOOK/chapter01/changelog.xml
===================================================================
--- trunk/BOOK/chapter01/changelog.xml	2012-05-11 03:01:26 UTC (rev 9849)
+++ trunk/BOOK/chapter01/changelog.xml	2012-05-11 12:27:48 UTC (rev 9850)
@@ -55,6 +55,17 @@
     </listitem>
 
     <listitem>
+      <para>2012-05-11</para>
+      <itemizedlist>
+         <listitem>
+           <para>[matthew] - Remove sed from GCC pass 2 and chapter 6, which
+           prevented the fixincludes script from being run; it is no longer run
+           by default. Reported by Jeremy Huntwork.</para>
+         </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2012-05-05</para>
       <itemizedlist>
          <listitem>

Modified: trunk/BOOK/chapter05/gcc-pass2.xml
===================================================================
--- trunk/BOOK/chapter05/gcc-pass2.xml	2012-05-11 03:01:26 UTC (rev 9849)
+++ trunk/BOOK/chapter05/gcc-pass2.xml	2012-05-11 12:27:48 UTC (rev 9850)
@@ -58,19 +58,6 @@
 <screen><userinput remap="pre">cat gcc/limitx.h gcc/glimits.h gcc/limity.h > \
   `dirname $($LFS_TGT-gcc -print-libgcc-file-name)`/include-fixed/limits.h</userinput></screen>
 
-    <para>Under normal circumstances the GCC <command>fixincludes</command> script
-    is run in order to fix potentially broken header files. As GCC-&gcc-version;
-    and Glibc-&glibc-version; have already been installed at this point, and
-    their respective header files are known to not require fixing, the
-    <command>fixincludes</command> script is not required. In fact, running
-    this script may actually pollute the build environment by
-    installing fixed headers from the host system into GCC's private include
-    directory. The running of the <command>fixincludes</command> script can
-    be suppressed by issuing the following commands:</para>
-
-<screen><userinput remap="pre">cp -v gcc/Makefile.in{,.orig}
-sed 's@\./fixinc\.sh at -c true@' gcc/Makefile.in.orig > gcc/Makefile.in</userinput></screen>
-
     <para>For x86 machines, a bootstrap build of GCC uses the
     <option>-fomit-frame-pointer</option> compiler flag.  Non-bootstrap builds
     omit this flag by default, and the goal should be to produce a compiler

Modified: trunk/BOOK/chapter06/gcc.xml
===================================================================
--- trunk/BOOK/chapter06/gcc.xml	2012-05-11 03:01:26 UTC (rev 9849)
+++ trunk/BOOK/chapter06/gcc.xml	2012-05-11 12:27:48 UTC (rev 9850)
@@ -57,14 +57,6 @@
   i?86) sed -i 's/^T_CFLAGS =$/& -fomit-frame-pointer/' gcc/Makefile.in ;;
 esac</userinput></screen>
 
-    <para>The <command>fixincludes</command> script is known to occasionally
-    erroneously attempt to "fix" the system headers installed so far.
-    As the headers up to this point are known to not require fixing,
-    issue the following command to prevent the <command>fixincludes</command>
-    script from running:</para>
-
-<screen><userinput remap="pre">sed -i 's@\./fixinc\.sh at -c true@' gcc/Makefile.in</userinput></screen>
-
     <para>The GCC documentation recommends building GCC outside of the source
     directory in a dedicated build directory:</para>
 

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2012-05-11 03:01:26 UTC (rev 9849)
+++ trunk/BOOK/general.ent	2012-05-11 12:27:48 UTC (rev 9850)
@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-20120510">
-<!ENTITY releasedate "May 10, 2012">
+<!ENTITY version "SVN-20120511">
+<!ENTITY releasedate "May 11, 2012">
 <!ENTITY copyrightdate "1999-2012"><!-- jhalfs needs a literal dash, not – -->
 <!ENTITY milestone "7.2">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->




More information about the lfs-book mailing list