Bladeren bron

Run fixincludes again, by removing the sed that disabled it. It no longer attempts to fix up host headers.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9850 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Matthew Burgess 13 jaren geleden
bovenliggende
commit
404d641304
4 gewijzigde bestanden met toevoegingen van 13 en 23 verwijderingen
  1. 11 0
      chapter01/changelog.xml
  2. 0 13
      chapter05/gcc-pass2.xml
  3. 0 8
      chapter06/gcc.xml
  4. 2 2
      general.ent

+ 11 - 0
chapter01/changelog.xml

@@ -54,6 +54,17 @@
       </itemizedlist>
     </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>

+ 0 - 13
chapter05/gcc-pass2.xml

@@ -58,19 +58,6 @@
 <screen><userinput remap="pre">cat gcc/limitx.h gcc/glimits.h gcc/limity.h &gt; \
   `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@-c true@' gcc/Makefile.in.orig &gt; 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

+ 0 - 8
chapter06/gcc.xml

@@ -57,14 +57,6 @@
   i?86) sed -i 's/^T_CFLAGS =$/&amp; -fomit-frame-pointer/' gcc/Makefile.in ;;
 esac</userinput></screen>
 
-    <para>The <command>fixincludes</command> script is known to occasionally
-    erroneously attempt to &quot;fix&quot; 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@-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>
 

+ 2 - 2
general.ent

@@ -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 &ndash; -->
 <!ENTITY milestone "7.2">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->