aboutsummaryrefslogtreecommitdiffstats
path: root/chapter06
diff options
context:
space:
mode:
authorMatthew Burgess <matthew@linuxfromscratch.org>2009-10-20 18:12:36 +0000
committerMatthew Burgess <matthew@linuxfromscratch.org>2009-10-20 18:12:36 +0000
commit093af3be1e122c77525069040a5e3628a469eb86 (patch)
tree234608d5499056f4770dd6347342b6e759d9e312 /chapter06
parent7c4b9931a5b37089f5e417dde6909c3780ff4387 (diff)
Upgrade to Binutils-2.20. Fixes #2505.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9085 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Diffstat (limited to 'chapter06')
-rw-r--r--chapter06/binutils.xml5
-rw-r--r--chapter06/glibc.xml5
2 files changed, 5 insertions, 5 deletions
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>