From 4ea51131cfeec6c13ad8bacffe3912a3d7a6def8 Mon Sep 17 00:00:00 2001
From: Randy McMurchy <randy@linuxfromscratch.org>
Date: Wed, 27 Jul 2005 20:12:03 +0000
Subject: [PATCH] Removed the mention of the GCC testsuite tarball from the GCC
 instructions as the testsuite is already included in the GCC release tarball

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@4805 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general/prog/gcc.xml | 51 ++++++++++++++++++--------------------------
 1 file changed, 21 insertions(+), 30 deletions(-)

diff --git a/general/prog/gcc.xml b/general/prog/gcc.xml
index 4c87c2bd91..7e44d3dc6e 100644
--- a/general/prog/gcc.xml
+++ b/general/prog/gcc.xml
@@ -15,10 +15,7 @@
   <!ENTITY gnat-download-ftp  "ftp://cs.nyu.edu/pub/gnat/3.15p/gnat-3.15p-i686-pc-redhat71-gnu-bin.tar.gz">
   <!ENTITY gnat-md5sum        "57c060cd1ccef8b1ae9165b11d98780a">
   <!ENTITY gnat-size          "13.4 MB">
-  <!ENTITY gnat-time          "0.01 SBU">
-
-  <!ENTITY gcc-testsuite-url    "http://mirrors.rcn.net/pub/sourceware/gcc/releases/gcc-&gcc-version;/gcc-testsuite-&gcc-version;.tar.bz2">
-  <!ENTITY gcc-testsuite-md5sum "b4fff6ce0a038021b9e507917abb9a07">
+  <!ENTITY gnat-time          "less than 0.1 SBU">
 ]>
 
 <sect1 id="gcc" xreflabel="GCC-&gcc-version;">
@@ -76,12 +73,6 @@
         <para>Required patch: <ulink
         url="&patch-root;/gcc-&gcc-version;-linkonce-1.patch"/></para>
       </listitem>
-      <listitem>
-        <para>Test suite: <ulink url="&gcc-testsuite-url;"/></para>
-      </listitem>
-      <listitem>
-        <para>Test suite MD5 sum: &gcc-testsuite-md5sum;</para>
-      </listitem>
     </itemizedlist>
 
     <bridgehead renderas="sect3">GCC Dependencies</bridgehead>
@@ -174,31 +165,20 @@ export PATH=/opt/gnat/bin:$PATH</userinput></screen>
       <application>GCC</application> compiler and libraries. It
       is highly recommended that you have the <application>Tcl</application>,
       <application>Expect</application> and <application>DejaGnu</application>
-      packages installed, as well as unpacking the <application>GCC</application>
-      testsuite tarball before beginning the build.</para>
+      packages installed before beginning the build so you can run the full
+      suite of tests.</para>
 
       <para>Do not continue with the <command>make install</command> command
-      until you're confident the build was successful. You can compare your test results
-      with those found at <ulink url="http://gcc.gnu.org/ml/gcc-testresults/"/>. There's
-      also an i686 platform test result produced by an LFS-SVN-20050316 system at
-      <ulink url="http://linuxfromscratch.org/~randy/gcc343_test.txt"/>. You may also
-      want to refer to the information found in the
+      until you're confident the build was successful. You can compare your
+      test results with those found at
+      <ulink url="http://gcc.gnu.org/ml/gcc-testresults/"/>. There's also an
+      i686 platform test result produced by an LFS-6.1 system at
+      <ulink url="http://linuxfromscratch.org/~randy/gcc343_test.txt"/>. You
+      may also want to refer to the information found in the
       <application>GCC</application>-Pass 2 section of Chapter 5 in the LFS book
       (<ulink url="&lfs-root;/chapter05/gcc-pass2.html"/>).</para>
     </important>
 
-    <note>
-      <para>Some of the <application>Java</application> programs installed by
-      the <application>GCC</application> package conflict (have the same names)
-      with programs from the <xref linkend="jdk"/> package. If you're installing the
-      <application>Java</application> language from the
-      <application>GCC</application> package but you wish to use the programs
-      from the <application>JDK</application> as the defaults, ensure
-      <filename class='directory'>$JAVA_HOME/bin</filename> is listed before
-      <filename class='directory'>/usr/bin</filename> in your <envar>PATH</envar>
-      variable after the <application>GCC</application> installation is complete.</para>
-    </note>
-
 <screen><userinput>patch -Np1 -i ../gcc-&gcc-version;-no_fixincludes-1.patch &amp;&amp;
 patch -Np1 -i ../gcc-&gcc-version;-linkonce-1.patch &amp;&amp;
 sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in &amp;&amp;
@@ -246,6 +226,18 @@ chown -v -R root:root \
 <screen><userinput>export PATH=$PATH_HOLD &amp;&amp;
 unset PATH_HOLD</userinput></screen>
 
+    <note>
+      <para>Some of the <application>Java</application> programs installed by
+      the <application>GCC</application> package conflict (have the same names)
+      with programs from the <xref linkend="jdk"/> package. If you installed
+      the <application>Java</application> language from the
+      <application>GCC</application> package but you wish to use the programs
+      from the <application>JDK</application> as the defaults, ensure
+      <filename class='directory'>$JAVA_HOME/bin</filename> is listed before
+      <filename class='directory'>/usr/bin</filename> in your
+      <envar>PATH</envar> variable.</para>
+    </note>
+
   </sect2>
 
   <sect2 role="commands">
@@ -639,4 +631,3 @@ unset PATH_HOLD</userinput></screen>
   </sect2>
 
 </sect1>
-