From 49168420d4a3d3e6b8050db9239724c774c2058a Mon Sep 17 00:00:00 2001
From: Matthew Burgess <matthew@linuxfromscratch.org>
Date: Tue, 20 Apr 2010 20:08:12 +0000
Subject: Upgrade to GCC-4.5.0, including the addition of its new dependency,
 MPC. Fixes #2636.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9254 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter05/gcc-pass1.xml |  6 ++++--
 chapter05/gcc-pass2.xml | 11 +++++++----
 chapter05/glibc.xml     |  4 ++++
 3 files changed, 15 insertions(+), 6 deletions(-)

(limited to 'chapter05')

diff --git a/chapter05/gcc-pass1.xml b/chapter05/gcc-pass1.xml
index a99074458..ad80e86e4 100644
--- a/chapter05/gcc-pass1.xml
+++ b/chapter05/gcc-pass1.xml
@@ -43,14 +43,16 @@
   <sect2 role="installation">
     <title>Installation of Cross GCC</title>
 
-    <para>GCC now requires the GMP and MPFR packages. As these packages may
+    <para>GCC now requires the GMP, MPFR and MPC packages. As these packages may
     not be included in your host distribution, they will be built with
     GCC:</para>
 
 <screen><userinput remap="pre">tar -jxf ../mpfr-&mpfr-version;.tar.bz2
 mv -v mpfr-&mpfr-version; mpfr
 tar -jxf ../gmp-&gmp-version;.tar.bz2
-mv -v gmp-&gmp-version; gmp</userinput></screen>
+mv -v gmp-&gmp-version; gmp
+tar -zxf ../mpc-&mpc-version;.tar.gz
+mv -v mpc-&mpc-version; mpc</userinput></screen>
 
     <para>The GCC documentation recommends building GCC outside of the
     source directory in a dedicated build directory:</para>
diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml
index 76107dddb..872ab2213 100644
--- a/chapter05/gcc-pass2.xml
+++ b/chapter05/gcc-pass2.xml
@@ -128,13 +128,16 @@ done</userinput></screen>
   ;;
 esac</userinput></screen>
 
-    <para>As in the first build of GCC it requires the GMP and MPFR packages.
-    Unpack the tarballs and move them into the required directory names:</para>
+    <para>As in the first build of GCC it requires the GMP, MPFR and MPC
+    packages. Unpack the tarballs and move them into the required directory
+    names:</para>
 
 <screen><userinput remap="pre">tar -jxf ../mpfr-&mpfr-version;.tar.bz2
 mv -v mpfr-&mpfr-version; mpfr
 tar -jxf ../gmp-&gmp-version;.tar.bz2
-mv -v gmp-&gmp-version; gmp</userinput></screen>
+mv -v gmp-&gmp-version; gmp
+tar -zxf ../mpc-&mpc-version;.tar.gz
+mv -v mpc-&mpc-version; mpc</userinput></screen>
 
     <para>Create a separate build directory again:</para>
 
@@ -226,7 +229,7 @@ cd ../gcc-build</userinput></screen>
 
     <para>Compile the package:</para>
 
-<screen><userinput remap="make">make</userinput></screen>
+<screen><userinput remap="make">make LD_LIBRARY_PATH=$(pwd)/$(../gcc-&gcc-version;/config.guess)/libgcc</userinput></screen>
 
     <para>Install the package:</para>
 
diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml
index 862a09f5a..6040eb430 100644
--- a/chapter05/glibc.xml
+++ b/chapter05/glibc.xml
@@ -43,6 +43,10 @@
   <sect2 role="installation">
     <title>Installation of Glibc</title>
 
+    <para>Fix a bug that prevents Glibc from building with GCC-&gcc-version;:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&glibc-gcc_fix-patch;</userinput></screen>
+
     <para>The Glibc documentation recommends building Glibc outside of the source
     directory in a dedicated build directory:</para>
 
-- 
cgit v1.2.3-54-g00ecf