Upgrade to Glibc-2.6.1. Fixes #2018. Thanks to several people mentioned in the changelog.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@8375 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

9 files changed, 60 insertions, 8 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 6dabdd7be..4609ba33a 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -40,6 +40,14 @@
        <para>2007-09-15</para>
       <itemizedlist>
         <listitem>
+          <para>[jhuntwork] - Upgrade to Glibc-2.6.1. Fixes
+          <ulink url="&lfs-ticket-root;2018">#2018</ulink>.
+	  Thanks to Matthew Burgess for preparing a discrete patch,
+	  Robert Connolly and Dan Nicholson for investigating how best
+	  to adjust CFLAGS, and Greg Schafer for showing the technical
+	  benefits of using CFLAGS with Glibc.</para>
+        </listitem>
+        <listitem>
           <para>[jhuntwork] - Upgrade to GCC-4.2.1. Fixes
           <ulink url="&lfs-ticket-root;2002">#2002</ulink>.
 	  Thanks to Matthew Burgess for preparing a discrete patch.</para>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index e8c63c12c..ceb7be18c 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -83,9 +83,9 @@
     <!--<listitem>
       <para>Gettext &gettext-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Glibc &glibc-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Grep &grep-version;</para>
     </listitem>-->
diff --git a/chapter05/coreutils.xml b/chapter05/coreutils.xml
index 8d367b1ba..e52e60d85 100644
--- a/chapter05/coreutils.xml
+++ b/chapter05/coreutils.xml
@@ -43,6 +43,15 @@
   <sect2 role="installation">
     <title>Installation of Coreutils</title>
 
+    <para>The version of the function <quote>futimens</quote> used
+    by Coreutils is incompatible with the version that current
+    Glibc provides, so we'll rename the function:</para>
+
+<screen><userinput>for file in src/{copy,touch}.c lib/utimens.{c,h} ; do \
+   cp -v $file{,.orig}
+   sed 's/futimens/gl_&amp;/' $file.orig &gt; $file
+done</userinput></screen>
+
     <para>Prepare Coreutils for compilation:</para>
 
 <screen><userinput>./configure --prefix=/tools</userinput></screen>
diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml
index 0710ea5da..dd35ef1d3 100644
--- a/chapter05/glibc.xml
+++ b/chapter05/glibc.xml
@@ -49,6 +49,16 @@
 <screen><userinput>mkdir -v ../glibc-build
 cd ../glibc-build</userinput></screen>
 
+    <para>Because Glibc no longer supports i386, its developers say to use the
+    compiler flag <parameter>-march=i486</parameter> when building it for x86
+    machines. There are several ways to accomplish that, but testing shows that
+    the flag is best placed inside the build variable <quote>CFLAGS</quote>.
+    Instead of overriding completely what Glibc's internal build system uses
+    for CFLAGS, append the new flag to the existing contents of CFLAGS by
+    making use of the special file <filename>configparms</filename>:</para>
+
+<screen><userinput>echo "CFLAGS += -march=i486" &gt; configparms</userinput></screen>
+
     <para>Next, prepare Glibc for compilation:</para>
 
 <screen><userinput>../glibc-&glibc-version;/configure --prefix=/tools \
diff --git a/chapter05/gzip.xml b/chapter05/gzip.xml
index a75659e2e..eb2c6a7c8 100644
--- a/chapter05/gzip.xml
+++ b/chapter05/gzip.xml
@@ -43,6 +43,15 @@
   <sect2 role="installation">
     <title>Installation of Gzip</title>
 
+    <para>The version of the function <quote>futimens</quote> used
+    by Gzip is incompatible with the version that current
+    Glibc provides, so we'll rename the function:</para>
+
+<screen><userinput>for file in gzip.c lib/utimens.{c,h} ; do \
+   cp -v $file{,.orig}
+   sed 's/futimens/gl_&amp;/' $file.orig &gt; $file
+done</userinput></screen>
+
     <para>Prepare Gzip for compilation:</para>
 
 <screen><userinput>./configure --prefix=/tools</userinput></screen>
diff --git a/chapter06/coreutils.xml b/chapter06/coreutils.xml
index 3b4a0318e..82693d20c 100644
--- a/chapter06/coreutils.xml
+++ b/chapter06/coreutils.xml
@@ -41,6 +41,12 @@
   <sect2 role="installation">
     <title>Installation of Coreutils</title>
 
+    <para>The version of the function <quote>futimens</quote> used
+    by Coreutils is incompatible with the version that current
+    Glibc provides, so we'll rename the function:</para>
+
+<screen><userinput>sed -i 's/futimens/gl_&amp;/' src/{copy,touch}.c lib/utimens.{c,h}</userinput></screen>
+
     <para>A known issue with the <command>uname</command> program from
     this package is that the <parameter>-p</parameter> switch always
     returns <computeroutput>unknown</computeroutput>. The following patch
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index 93ca99aef..14860f6cf 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -102,6 +102,10 @@ mv glibc-libidn-&glibc-version; libidn</userinput></screen>
 <screen><userinput>mkdir -v ../glibc-build
 cd ../glibc-build</userinput></screen>
 
+    <para>Again, add the needed compiler flag to CFLAGS:</para>
+
+<screen><userinput>echo "CFLAGS += -march=i486" &gt; configparms</userinput></screen>
+
     <para>Prepare Glibc for compilation:</para>
 
 <screen><userinput>../glibc-&glibc-version;/configure --prefix=/usr \
diff --git a/chapter06/gzip.xml b/chapter06/gzip.xml
index 4f46665a2..e4eb2c394 100644
--- a/chapter06/gzip.xml
+++ b/chapter06/gzip.xml
@@ -41,6 +41,12 @@
   <sect2 role="installation">
     <title>Installation of Gzip</title>
 
+    <para>The version of the function <quote>futimens</quote> used
+    by Gzip is incompatible with the version that current
+    Glibc provides, so we'll rename the function:</para>
+
+<screen><userinput>sed -i 's/futimens/gl_&amp;/' gzip.c lib/utimens.{c,h}</userinput></screen>
+
     <para>Prepare Gzip for compilation:</para>
 
 <screen><userinput>./configure --prefix=/usr --bindir=/bin</userinput></screen>
diff --git a/packages.ent b/packages.ent
index 99d1b743e..16e0e3617 100644
--- a/packages.ent
+++ b/packages.ent
@@ -190,19 +190,19 @@
 <!ENTITY gettext-ch6-du "65 MB">
 <!ENTITY gettext-ch6-sbu "1 SBU">
 
-<!ENTITY glibc-version "2.5.1">
-<!ENTITY glibc-size "15,060 KB">
+<!ENTITY glibc-version "2.6.1">
+<!ENTITY glibc-size "15,398 KB">
 <!ENTITY glibc-url "&gnu;glibc/glibc-&glibc-version;.tar.bz2">
-<!ENTITY glibc-md5 "10ea72e2c4d56c6aa13dabb7c4f9b195">
+<!ENTITY glibc-md5 "11cf6d3fc86dbe0890b8d00372eb6286">
 <!ENTITY glibc-home "&gnu-software;libc/">
 <!ENTITY glibc-ch5-du "342 MB">
 <!ENTITY glibc-ch5-sbu "7 SBU">
 <!ENTITY glibc-ch6-du "556 MB testsuite included">
 <!ENTITY glibc-ch6-sbu "19.5 SBU testsuite included">
 <!ENTITY glibc-libidn-version "&glibc-version;">
-<!ENTITY glibc-libidn-size "123 KB">
-<!ENTITY glibc-libidn-url "&gnu;glibc/glibc-libidn-&glibc-libidn-version;.tar.gz">
-<!ENTITY glibc-libidn-md5 "51b46f055908a5f8e409c4200d828093">
+<!ENTITY glibc-libidn-size "100 KB">
+<!ENTITY glibc-libidn-url "&gnu;glibc/glibc-libidn-&glibc-libidn-version;.tar.bz2">
+<!ENTITY glibc-libidn-md5 "503f1315afd808728ebaa75b3d87a7d9">
 <!ENTITY glibc-libidn-home " ">
 
 <!ENTITY grep-version "2.5.1a">