From 8f192d8dbcb6566a9537979a70b01fd3679fba0f Mon Sep 17 00:00:00 2001
From: Ken Moffat <ken@linuxfromscratch.org>
Date: Fri, 14 Oct 2005 23:44:39 +0000
Subject: [PATCH] binutils and glibc patches, space/time updates

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/6.1.1/BOOK@7017 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml      |  6 ++++++
 chapter03/patches.xml        | 14 ++++++++++++++
 chapter05/binutils-pass1.xml |  9 ++++++++-
 chapter05/perl.xml           |  2 +-
 chapter06/glibc.xml          |  5 +++++
 chapter06/perl.xml           |  2 +-
 chapter06/zlib.xml           |  2 +-
 patches.ent                  |  2 ++
 8 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index c8352868e..929b0deee 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -26,8 +26,10 @@ First a summary, then a detailed log.</para>
 
 <listitem><para>Added:</para>
 <itemizedlist>
+<listitem><para>binutils-&binutils-version;-gcc4-1.patch</para></listitem>
 <listitem><para>bzip2-&bzip2-version;-install_docs-1.patch</para></listitem>
 <listitem><para>bzip2-&bzip2-version;-bzgrep_security-1.patch</para></listitem>
+<listitem><para>glibc-&glibc-version;-rtld_search_dirs-1.patch</para></listitem>
 <listitem><para>texinfo-&texinfo-version;-tempfile_fix-1.patch</para></listitem>
 <listitem><para>util-linux-&util-linux-version;-umount_fix-1.patch</para></listitem>
 <listitem><para>vim-&vim-version;-security_fix-2.patch</para></listitem>
@@ -40,6 +42,10 @@ First a summary, then a detailed log.</para>
 </itemizedlist>
 </listitem>
 
+<listitem><para>October 14th, 2005 [ken]: Added a patch to allow binutils
+to be built from a host running gcc-4, updateid gcc instructions for the rtld
+patch, updated space/time for perl and zlib.</para></listitem> 	
+
 <listitem><para>October 14th, 2005 [matt]: Added a patch to fix a security
 vulnerability in util-linux.</para></listitem>
 
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 76a756b94..c20603598 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -29,6 +29,13 @@ needed to build an LFS system:</para>
 </listitem>
 </varlistentry>
 
+<varlistentry>
+<term>Binutils Build From Host Running Gcc4 Patch - 2 KB:</term>
+<listitem>
+<para><ulink url="&patches-root;&binutils-gcc4-patch;"/></para>
+</listitem>
+</varlistentry>
+
 <varlistentry>
 <term>Bzip2 Documentation Patch - 1 KB:</term>
 <listitem>
@@ -92,6 +99,13 @@ needed to build an LFS system:</para>
 </listitem>
 </varlistentry>
 
+<varlistentry>
+<term>Glibc Rtld Search Dirs Patch - 1 KB:</term>
+<listitem>
+<para><ulink url="&patches-root;&glibc-rtld-patch;"/></para>
+</listitem>
+</varlistentry>
+
 <varlistentry>
 <term>Glibc Fix Testsuite Patch - 1 KB:</term>
 <listitem>
diff --git a/chapter05/binutils-pass1.xml b/chapter05/binutils-pass1.xml
index 634098937..c33a87153 100644
--- a/chapter05/binutils-pass1.xml
+++ b/chapter05/binutils-pass1.xml
@@ -17,7 +17,7 @@
 <segmentedlist>
 <segtitle>&buildtime;</segtitle>
 <segtitle>&diskspace;</segtitle>
-<seglistitem><seg>1.0 SBU</seg><seg>170 MB</seg></seglistitem>
+<seglistitem><seg>1.0 SBU</seg><seg>179 MB</seg></seglistitem>
 </segmentedlist>
 
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/binutils.xml" xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/>
@@ -39,6 +39,13 @@ variables that override default optimizations have been defined, such
 as <envar>CFLAGS</envar> and <envar>CXXFLAGS</envar>,
 unset them when building Binutils.</para>
 
+<para>If you are building from a host running Gcc-4 or later, it is necessary
+to patch the first build of this version of Binutils so that it can be
+compiled by the host system.</para>
+
+<screen><userinput>patch -Np1 -i ../binutils-&binutils-version;-gcc4-1.patch
+</userinput></screen>
+
 <para>The Binutils documentation recommends building Binutils outside of the
 source directory in a dedicated build directory:</para>
 
diff --git a/chapter05/perl.xml b/chapter05/perl.xml
index 88a1adc24..309ec6307 100644
--- a/chapter05/perl.xml
+++ b/chapter05/perl.xml
@@ -17,7 +17,7 @@
 <segmentedlist>
 <segtitle>&buildtime;</segtitle>
 <segtitle>&diskspace;</segtitle>
-<seglistitem><seg>0.8 SBU</seg><seg>79.8 MB</seg></seglistitem>
+<seglistitem><seg>0.8 SBU</seg><seg>81.6 MB</seg></seglistitem>
 </segmentedlist>
 
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/perl.xml" xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/>
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index b2b8b94bd..b868af0d5 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -51,6 +51,11 @@ within the Glibc source directory:</para>
 
 <screen><userinput>tar -xjvf /sources/glibc-linuxthreads-&glibc-version;.tar.bz2</userinput></screen>
 
+<para>In certain rare circumstances, Glibc can segfault when no standard search
+directories exist.  The following patch prevents this:</para> 
+
+<screen><userinput>patch -Np1 -i ../glibc-&glibc-version;-rtld_search_dirs-1.patch</userinput></screen>
+
 <para>Glibc has two tests which fail when the running kernel is 2.6.11.x The
 problem has been determined to be with the tests themselves, not with the libc
 nor the kernel. This patch fixes the problem:</para>
diff --git a/chapter06/perl.xml b/chapter06/perl.xml
index f69b215b2..33f28574d 100644
--- a/chapter06/perl.xml
+++ b/chapter06/perl.xml
@@ -15,7 +15,7 @@
 <segmentedlist>
 <segtitle>&buildtime;</segtitle>
 <segtitle>&diskspace;</segtitle>
-<seglistitem><seg>2.9 SBU</seg><seg>137 MB</seg></seglistitem>
+<seglistitem><seg>4.1 SBU</seg><seg>140 MB</seg></seglistitem>
 </segmentedlist>
 
 <segmentedlist>
diff --git a/chapter06/zlib.xml b/chapter06/zlib.xml
index 55e0a9c46..5ffe8cb44 100644
--- a/chapter06/zlib.xml
+++ b/chapter06/zlib.xml
@@ -16,7 +16,7 @@ some programs.</para>
 <segmentedlist>
 <segtitle>&buildtime;</segtitle>
 <segtitle>&diskspace;</segtitle>
-<seglistitem><seg>0.1 SBU</seg><seg>2.7 MB</seg></seglistitem>
+<seglistitem><seg>0.1 SBU</seg><seg>3.1 MB</seg></seglistitem>
 </segmentedlist>
 
 <segmentedlist>
diff --git a/patches.ent b/patches.ent
index 010d789f1..f3a66942b 100644
--- a/patches.ent
+++ b/patches.ent
@@ -4,6 +4,7 @@
 <!ENTITY bash-fixes-patch "bash-&bash-version;-fixes-3.patch">
 <!ENTITY bash-avoid_WCONTINUED-patch "bash-&bash-version;-avoid_WCONTINUED-1.patch">
 
+<!ENTITY binutils-gcc4-patch "binutils-&binutils-version;-gcc4-1.patch">
 <!ENTITY bzip2-docs-patch "bzip2-&bzip2-version;-install_docs-1.patch">
 <!ENTITY bzip2-bzgrep-patch "bzip2-&bzip2-version;-bzgrep_security-1.patch">
 
@@ -18,6 +19,7 @@
 <!ENTITY gcc-no_fixincludes-patch "gcc-&gcc-version;-no_fixincludes-1.patch">
 <!ENTITY gcc-specs-patch "gcc-&gcc-version;-specs-2.patch">
 
+<!ENTITY glibc-rtld-patch "glibc-&glibc-version;-rtld_search_dirs-1.patch">
 <!ENTITY glibc-testfix-patch "glibc-&glibc-version;-fix_test-1.patch">
 
 <!ENTITY gzip-security_fix-patch "gzip-&gzip-version;-security_fixes-1.patch">