diff options
| author | Matthew Burgess <matthew@linuxfromscratch.org> | 2012-03-27 19:54:59 +0000 |
|---|---|---|
| committer | Matthew Burgess <matthew@linuxfromscratch.org> | 2012-03-27 19:54:59 +0000 |
| commit | f7d98e89550dfb9a93027fccd82272034bd02d1b (patch) | |
| tree | b2870ced87e2539ab864fd559b5f5739a0b2a8ab | |
| parent | f3efd8b961e80a8fa0876e4b758102f7f14cff30 (diff) | |
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
| -rw-r--r-- | chapter01/changelog.xml | 11 | ||||
| -rw-r--r-- | chapter01/whatsnew.xml | 4 | ||||
| -rw-r--r-- | chapter03/patches.xml | 8 | ||||
| -rw-r--r-- | chapter06/glibc.xml | 3 | ||||
| -rw-r--r-- | general.ent | 4 | ||||
| -rw-r--r-- | patches.ent | 5 |
6 files changed, 33 insertions, 2 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 07b1906d9..e1b031af9 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -37,6 +37,17 @@ --> <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> <listitem> diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index 265795c37..212560992 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -227,6 +227,10 @@ <para>&gcc-startfiles-patch;</para> </listitem> + <listitem> + <para>&glibc-gcc_fix-patch;</para> + </listitem> + </itemizedlist> <itemizedlist> diff --git a/chapter03/patches.xml b/chapter03/patches.xml index 30d45d113..b6379105b 100644 --- a/chapter03/patches.xml +++ b/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> diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml index 3d106a5cc..1c0609eaa 100644 --- a/chapter06/glibc.xml +++ b/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> diff --git a/general.ent b/general.ent index 79cb02c68..105e43262 100644 --- a/general.ent +++ b/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 – --> <!ENTITY milestone "7.2"> <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" --> diff --git a/patches.ent b/patches.ent index d052e1089..1fad4b7db 100644 --- a/patches.ent +++ b/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"> |