Modified the Chapter 5 instructions so that instead of building the GMP and MPFR packages separately for GCC Pass2, they are built by GCC internally

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@8661 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

5 files changed, 18 insertions, 6 deletions

diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml
index 2ec433c87..ee117521a 100644
--- a/appendices/dependencies.xml
+++ b/appendices/dependencies.xml
@@ -486,9 +486,8 @@
 
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Diffutils, Findutils, Gawk, GCC,
-         Gettext, Glibc, GMP (Chapter 5-Pass 2 and Chapter 6), Grep,
-         M4 (Chapter 5-Pass 1), Make, MPFR (Chapter 5-Pass 2 and Chapter 6),
-         Patch, Perl, Sed, Tar, and Texinfo</seg>
+         Gettext, Glibc, GMP (Chapter 6), Grep, M4 (Chapter 5), Make,
+         MPFR (Chapter 6), Patch, Perl, Sed, Tar, and Texinfo</seg>
         </seglistitem>
       </segmentedlist>
 
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 5ce9883ae..4e325cf83 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -41,6 +41,11 @@
       <para>2008-10-13</para>
       <itemizedlist>
         <listitem>
+          <para>[randy] - Modified the Chapter 5 instructions so that instead
+          of building the GMP and MPFR packages separately for GCC Pass2, they
+          are built by GCC internally.</para>
+        </listitem>
+        <listitem>
           <para>[randy] - Added a configure option to the Chapter 6 Gettext
           instructions so that the documentation is installed in a versioned
           directory.</para>
diff --git a/chapter05/chapter05.xml b/chapter05/chapter05.xml
index 9afe0c18b..76250d2b8 100644
--- a/chapter05/chapter05.xml
+++ b/chapter05/chapter05.xml
@@ -22,8 +22,8 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="tcl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="expect.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="dejagnu.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gmp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mpfr.xml"/>
+  <!-- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gmp.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mpfr.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gcc-pass2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="binutils-pass2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ncurses.xml"/>
diff --git a/chapter05/gcc-pass1.xml b/chapter05/gcc-pass1.xml
index 1731034da..8be69fb60 100644
--- a/chapter05/gcc-pass1.xml
+++ b/chapter05/gcc-pass1.xml
@@ -92,7 +92,7 @@ cd ../gcc-build</userinput></screen>
       <varlistentry>
         <term><parameter>--disable-shared</parameter></term>
         <listitem>
-          <para>This switch forces gcc to link its internal libraries
+          <para>This switch forces GCC to link its internal libraries
           statically. We do this to avoid possible issues with the host
           system.</para>
         </listitem>
diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml
index 2dccf00f6..0bbab725b 100644
--- a/chapter05/gcc-pass2.xml
+++ b/chapter05/gcc-pass2.xml
@@ -124,6 +124,14 @@ done</userinput></screen>
     changes to the original files in case the command is inadvertently run twice.
     </para>
 
+    <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>
+
+<screen><userinput remap="pre">tar -jxf ../mpfr-&mpfr-version;.tar.bz2
+mv mpfr-&mpfr-version; mpfr
+tar -jxf ../gmp-&gmp-version;.tar.bz2
+mv gmp-&gmp-version; gmp</userinput></screen>
+
     <para>Create a separate build directory again:</para>
 
 <screen><userinput remap="pre">mkdir -v ../gcc-build