From 8320e26f720f50ea2198663726fdff9de9584b51 Mon Sep 17 00:00:00 2001
From: Matthew Burgess <matthew@linuxfromscratch.org>
Date: Sun, 8 Aug 2010 08:45:08 +0000
Subject: [PATCH] Upgrade to Glibc-2.12.1. Fixes #2730.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9351 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
chapter01/changelog.xml | 10 ++++++++++
chapter05/m4.xml | 6 ++++++
chapter06/m4.xml | 6 ++++++
general.ent | 4 ++--
packages.ent | 6 +++---
5 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 85781456c..22f44f354 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -37,6 +37,16 @@
-->
+ <listitem>
+ <para>2010-08-08</para>
+ <itemizedlist>
+ <listitem>
+ <para>[matthew] - Upgrade to Glibc-2.12.1. Fixes
+ <ulink url="&lfs-ticket-root;2730">#2730</ulink>.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
<listitem>
<para>2010-08-03</para>
<itemizedlist>
diff --git a/chapter05/m4.xml b/chapter05/m4.xml
index 4be3a0f36..0aa067d5c 100644
--- a/chapter05/m4.xml
+++ b/chapter05/m4.xml
@@ -43,6 +43,12 @@
<sect2 role="installation">
<title>Installation of M4</title>
+ <para>Add a missing include directive that prevents M4 successfully building
+ against Glibc-&glibc-version;:</para>
+
+<screen><userinput remap="pre">sed -i -e '/"m4.h"/a\
+#include <sys/stat.h>' src/path.c</userinput></screen>
+
<para>Prepare M4 for compilation:</para>
<screen><userinput remap="configure">./configure --prefix=/tools</userinput></screen>
diff --git a/chapter06/m4.xml b/chapter06/m4.xml
index c22282c1d..cf7934ee5 100644
--- a/chapter06/m4.xml
+++ b/chapter06/m4.xml
@@ -40,6 +40,12 @@
<sect2 role="installation">
<title>Installation of M4</title>
+ <para>Add a missing include directive that prevents M4 successfully building
+ against Glibc-&glibc-version;:</para>
+
+<screen><userinput remap="pre">sed -i -e '/"m4.h"/a\
+#include <sys/stat.h>' src/path.c</userinput></screen>
+
<para>Prepare M4 for compilation:</para>
<screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
diff --git a/general.ent b/general.ent
index d22045493..e9acf2f57 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-20100803">
-<!ENTITY releasedate "August 3, 2010">
+<!ENTITY version "SVN-20100808">
+<!ENTITY releasedate "August 8, 2010">
<!ENTITY copyrightdate "1999-2010"><!-- jhalfs needs a literal dash, not – -->
<!ENTITY milestone "6.7">
<!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
diff --git a/packages.ent b/packages.ent
index ee284c619..79467b419 100644
--- a/packages.ent
+++ b/packages.ent
@@ -193,10 +193,10 @@
<!ENTITY gettext-ch6-du "125 MB">
<!ENTITY gettext-ch6-sbu "5.8 SBU">
-<!ENTITY glibc-version "2.11.2">
-<!ENTITY glibc-size "15,308 KB">
+<!ENTITY glibc-version "2.12.1">
+<!ENTITY glibc-size "15,300 KB">
<!ENTITY glibc-url "&gnu;glibc/glibc-&glibc-version;.tar.bz2">
-<!ENTITY glibc-md5 "414fc1bad64c0e34ead0bb3d0f191456">
+<!ENTITY glibc-md5 "be0ea9e587f08c87604fe10a91f72afd">
<!ENTITY glibc-home "&gnu-software;libc/">
<!ENTITY glibc-ch5-du "371 MB">
<!ENTITY glibc-ch5-sbu "6.9 SBU">