From 8998cdef82f688702e3bdff4e0bcb4f7d28f19fa Mon Sep 17 00:00:00 2001
From: Jeremy Utley <jeremy@linuxfromscratch.org>
Date: Thu, 11 Sep 2003 18:21:18 +0000
Subject: [PATCH] Added Greg's patch to GCC to suppress libiberty, and allowed
 binutils' libiberty to stay

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@2767 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml     | 4 ++++
 chapter04/chapter04.xml     | 2 ++
 chapter06/binutils-inst.xml | 5 -----
 chapter06/gcc-inst.xml      | 9 ++++-----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 06fef00a8..9f4faa969 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -83,6 +83,10 @@
 </itemizedlist>
 </para></listitem>
 
+<listitem><para>September 11th, 2003 [jeremy]: Added Greg's patch to gcc to
+suppress the installation of libiberty, and changed binutils to allow it's
+libiberty to stay.</para></listitem>
+
 <listitem><para>September 11th, 2003 [jeremy]: Added caution tags around the
 reminder to not delete the binutils source and build directories in Chap 5.
 </para></listitem>
diff --git a/chapter04/chapter04.xml b/chapter04/chapter04.xml
index e07eb3eeb..64ad522f0 100644
--- a/chapter04/chapter04.xml
+++ b/chapter04/chapter04.xml
@@ -254,6 +254,8 @@ GCC No Fixincludes Patch:
 <ulink url="&http;/gcc-3.3.1-no_fixincludes-2.patch"/>
 GCC Specs Patch:
 <ulink url="&http;/gcc-3.3.1-specs-1.patch"/>
+GCC Suppress Libiberty Patch:
+<ulink url="&http;/gcc-3-3-1-suppress-libiberty.patch"/>
 
 Glibc Sscanf Patch:
 <ulink url="&http;/glibc-2.3.2-sscanf-1.patch"/>
diff --git a/chapter06/binutils-inst.xml b/chapter06/binutils-inst.xml
index ee4212fd4..d55f9b49a 100644
--- a/chapter06/binutils-inst.xml
+++ b/chapter06/binutils-inst.xml
@@ -39,10 +39,5 @@ generates code that can be executed on PowerPC machines).</para>
 
 <para><screen><userinput>make tooldir=/usr install</userinput></screen></para>
 
-<para>And remove a library that normally is not meant to be installed on its
-own:</para>
-
-<para><screen><userinput>rm /usr/lib/libiberty.a</userinput></screen></para>
-
 </sect2>
 
diff --git a/chapter06/gcc-inst.xml b/chapter06/gcc-inst.xml
index 5895d3b33..5e5dab528 100644
--- a/chapter06/gcc-inst.xml
+++ b/chapter06/gcc-inst.xml
@@ -17,7 +17,10 @@ compilers. Instructions for building these can be found at
 <ulink url="&blfs-root;view/cvs/general/gcc.html"/>.</para>
 
 <para><screen><userinput>patch -Np1 -i ../gcc-&gcc-version;-no_fixincludes-2.patch
-</userinput></screen></para>
+patch -Np1 -i ../gcc-3.3.1-suppress-libiberty.patch</userinput></screen></para>
+
+<para>The second patch here suppresses the installation of libiberty from GCC,
+as we will use the one provided by binutils instead.</para>
 
 <para>GCC's installation documentation recommends to build the package in a
 dedicated directory separate from the source tree. Create this build
@@ -76,8 +79,4 @@ compiler. To satisfy those packages, create a symlink:</para>
 
 <para><screen><userinput>ln -s gcc /usr/bin/cc</userinput></screen></para>
 
-<para>Remove the spurious a-out library again:</para>
-
-<para><screen><userinput>rm /usr/lib/libiberty.a</userinput></screen></para>
-
 </sect2>