aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chapter01/changelog.xml10
-rw-r--r--chapter01/whatsnew.xml8
-rw-r--r--chapter03/patches.xml8
-rw-r--r--chapter05/glibc.xml5
-rw-r--r--chapter06/binutils.xml5
-rw-r--r--chapter06/glibc.xml5
-rw-r--r--general.ent4
-rw-r--r--packages.ent6
-rw-r--r--patches.ent5
9 files changed, 44 insertions, 12 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index d9a4b74f0..d1b0752de 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -38,6 +38,16 @@
-->
<listitem>
+ <para>2009-10-20</para>
+ <itemizedlist>
+ <listitem>
+ <para>[matthew] Upgraded to Binutils-2.20. Fixes
+ <ulink url="&lfs-ticket-root;2505">#2505</ulink>.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>2009-10-12</para>
<itemizedlist>
<listitem>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 0a1054572..103dbebe4 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -34,9 +34,9 @@
<!--<listitem>
<para>Berkeley DB &db-version;</para>
</listitem>-->
- <!--<listitem>
+ <listitem>
<para>Binutils &binutils-version;</para>
- </listitem>-->
+ </listitem>
<!--<listitem>
<para>Bison &bison-version;</para>
</listitem>-->
@@ -223,6 +223,10 @@
</listitem>
<listitem>
+ <para>glibc-2.10.1-binutils-1.patch</para>
+ </listitem>
+
+ <listitem>
<para>gzip-1.3.13-zdiff-1.patch</para>
</listitem>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 7dffd7e9e..2b094f174 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -99,6 +99,14 @@
</varlistentry>
<varlistentry>
+ <term>Glibc Binutils Patch - <token>&glibc-binutils-patch-size;</token>:</term>
+ <listitem>
+ <para>Download: <ulink url="&patches-root;&glibc-binutils-patch;"/></para>
+ <para>MD5 sum: <literal>&glibc-binutils-patch-md5;</literal></para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term>Grep Debian Patch - <token>&grep-debian-patch-size;</token>:</term>
<listitem>
<para>Download: <ulink url="&patches-root;&grep-debian-patch;"/></para>
diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml
index d83498b98..1f66d03dc 100644
--- a/chapter05/glibc.xml
+++ b/chapter05/glibc.xml
@@ -43,6 +43,11 @@
<sect2 role="installation">
<title>Installation of Glibc</title>
+ <para>Apply a patch so that Glibc will build against
+ Binutils-&binutils-version;:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&glibc-binutils-patch;</userinput></screen>
+
<!-- This sed can be removed for any glibc newer than 2.10.1 (along with the
matching sed in chapter 6). See glibc bug 10262. -->
<para>Fix an error in the constants that get passed to the futex system
diff --git a/chapter06/binutils.xml b/chapter06/binutils.xml
index 3014adcda..19e693415 100644
--- a/chapter06/binutils.xml
+++ b/chapter06/binutils.xml
@@ -64,11 +64,6 @@ Ask your system administrator to create more.</computeroutput></screen>
<screen><userinput remap="pre">rm -fv etc/standards.info
sed -i.bak '/^INFO/s/standards.info //' etc/Makefile.in</userinput></screen>
- <para>Fix an issue that causes one of the tests to fail to compile against
- Glibc-&glibc-version;:</para>
-
-<screen><userinput remap="pre">sed -i -e 's/getline/get_line/' libiberty/testsuite/test-demangle.c</userinput></screen>
-
<para>The Binutils documentation recommends building Binutils outside of the
source directory in a dedicated build directory:</para>
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index 726b2a167..128e86ee0 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -101,6 +101,11 @@ unset DL</userinput></screen>
<screen><userinput remap="pre">sed -i 's|@BASH@|/bin/bash|' elf/ldd.bash.in</userinput></screen>
+ <para>Apply a patch so that Glibc will build against
+ Binutils-&binutils-version;:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&glibc-binutils-patch;</userinput></screen>
+
<para>Fix an error in one of the make check routines. Note that the escaped
newline in the second <command>sed</command> is required:</para>
diff --git a/general.ent b/general.ent
index 54513ed81..06eedcc8b 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "SVN-20091012">
-<!ENTITY releasedate "October 12, 2009">
+<!ENTITY version "SVN-20091020">
+<!ENTITY releasedate "October 20, 2009">
<!ENTITY copyrightdate "1999-2009"><!-- jhalfs needs a literal dash, not &ndash; -->
<!ENTITY milestone "7.0">
<!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
diff --git a/packages.ent b/packages.ent
index 25d93ad42..5cb9aa34a 100644
--- a/packages.ent
+++ b/packages.ent
@@ -33,10 +33,10 @@
<!ENTITY bash-ch6-du "35 MB">
<!ENTITY bash-ch6-sbu "1.4 SBU">
-<!ENTITY binutils-version "2.19.1">
-<!ENTITY binutils-size "15,865 KB">
+<!ENTITY binutils-version "2.20">
+<!ENTITY binutils-size "17,096 KB">
<!ENTITY binutils-url "&gnu;binutils/binutils-&binutils-version;.tar.bz2">
-<!ENTITY binutils-md5 "09a8c5821a2dfdbb20665bc0bd680791">
+<!ENTITY binutils-md5 "ee2d3e996e9a2d669808713360fa96f8">
<!ENTITY binutils-home "http://sources.redhat.com/binutils/">
<!ENTITY binutils-ch5p1-du "248 MB">
<!ENTITY binutils-ch5p1-sbu "1 SBU">
diff --git a/patches.ent b/patches.ent
index c1c538eb3..69b70dc44 100644
--- a/patches.ent
+++ b/patches.ent
@@ -50,6 +50,11 @@
<!ENTITY gettext-upstream_fixes-patch-size "2.9 KB">
+<!ENTITY glibc-binutils-patch "glibc-&glibc-version;-binutils-1.patch">
+<!ENTITY glibc-binutils-patch-md5 "ca5556631709e572738ed1d2c8b2b177">
+<!ENTITY glibc-binutils-patch-size "2.8 KB">
+
+
<!ENTITY grep-debian-patch "grep-&grep-version;-debian_fixes-1.patch">
<!ENTITY grep-debian-patch-md5 "337d017202d7e3b08d428a89da3ee572">
<!ENTITY grep-debian-patch-size "27 KB">