Эх сурвалжийг харах

Add Glibc's GCC patch back again to fix a build issue on x86 hosts.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9790 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Matthew Burgess 13 жил өмнө
parent
commit
f7d98e8955

+ 11 - 0
chapter01/changelog.xml

@@ -36,6 +36,17 @@
     </listitem>
 
 -->
+    <listitem>
+      <para>2012-03-27</para>
+      <itemizedlist>
+         <listitem>
+           <para>[matthew] - Add the GCC fix patch back to Glibc instructions
+           to fix a build issue on 32-bit hosts.  Thanks to Pierre Labastie for
+           the report.</para>
+         </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2012-03-26</para>
       <itemizedlist>

+ 4 - 0
chapter01/whatsnew.xml

@@ -227,6 +227,10 @@
       <para>&gcc-startfiles-patch;</para>
     </listitem>
 
+    <listitem>
+      <para>&glibc-gcc_fix-patch;</para>
+    </listitem>
+
   </itemizedlist>
 
   <itemizedlist>

+ 8 - 0
chapter03/patches.xml

@@ -66,6 +66,14 @@
       </listitem>
     </varlistentry>
 
+    <varlistentry>
+      <term>Glibc GCC Fix Patch - <token>&glibc-gcc_fix-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&glibc-gcc_fix-patch;"/></para>
+        <para>MD5 sum: <literal>&glibc-gcc_fix-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
 <!--
     <varlistentry>
       <term>GRUB Disk Geometry Patch - <token>&grub-geometry-patch-size;</token>:</term>

+ 3 - 0
chapter06/glibc.xml

@@ -100,6 +100,9 @@ unset DL</userinput></screen>
 
 <screen><userinput remap="pre">sed -i 's|@BASH@|/bin/bash|' elf/ldd.bash.in</userinput></screen>
 
+  <para>Fix a bug that prevents Glibc from building with GCC-&gcc-version;:</para>
+<screen><userinput remap="pre">patch -Np1 -i ../&glibc-gcc_fix-patch;</userinput></screen>
+
     <para>The Glibc documentation recommends building Glibc outside of the source
     directory in a dedicated build directory:</para>
 

+ 2 - 2
general.ent

@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-20120326">
-<!ENTITY releasedate "Mar 26, 2012">
+<!ENTITY version "SVN-20120327">
+<!ENTITY releasedate "Mar 27, 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}]" -->

+ 5 - 0
patches.ent

@@ -36,6 +36,11 @@
 <!ENTITY gcc-startfiles-patch-size "1.5 KB">
 
 
+<!ENTITY glibc-gcc_fix-patch "glibc-&glibc-version;-gcc_fix-1.patch">
+<!ENTITY glibc-gcc_fix-patch-md5 "d1f28cb98acb9417fe52596908bbb9fd">
+<!ENTITY glibc-gcc_fix-patch-size "2.5 KB">
+
+
 <!ENTITY grub-inode-patch "grub-&grub-version;-256byte_inode-1.patch">
 <!ENTITY grub-inode-patch-md5 "2482bef9c1866b4045767a56268ba673">
 <!ENTITY grub-inode-patch-size "4.8 KB">