aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chapter01/changelog.xml5
-rw-r--r--chapter05/gcc-exp.xml7
-rw-r--r--chapter06/gcc-inst.xml3
-rw-r--r--index.xml4
4 files changed, 9 insertions, 10 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index e64200f9f..6b6a958ab 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -22,10 +22,15 @@
<listitem><para>util-linux-2.11h</para></listitem>
<listitem><para>man-pages-1.39</para></listitem>
<listitem><para>gettext-0.10.39</para></listitem>
+<listitem><para>gcc-2.95.3</para></listitem>
</itemizedlist>
</para></listitem>
+<listitem><para>After much testing and discussing, it's been decided to
+downgrade to gcc-2.95.3 for the time being, until problems with the new
+gcc-3.0 version have been fixed.</para></listitem>
+
<listitem><para>Chapter 5: Removed kernel patch for gcc-3.0
compilation</para></listitem>
diff --git a/chapter05/gcc-exp.xml b/chapter05/gcc-exp.xml
index 406b42282..ae10b4d61 100644
--- a/chapter05/gcc-exp.xml
+++ b/chapter05/gcc-exp.xml
@@ -1,13 +1,6 @@
<sect2>
<title>Command explanations</title>
-<para><userinput>patch -Np1 -i ../gcc-3.0.patch:</userinput> This patch
-changes all instances of re_max_failures to re_max_failures2.
-re_max_failures is a variable used within Glibc and with static
-compiling this variable sometimes clashes between the package's
-re_max_failures and the same variable in glibc. By renaming
-re_max_failures in the package to re_max_failures2 we just tell the
-package to use the second variable so that glibc won't be in the way.</para>
<para><userinput>--enable-languages=c,c++:</userinput> This only builds the C
and C++ compilers and not the other available compilers as they are, on
diff --git a/chapter06/gcc-inst.xml b/chapter06/gcc-inst.xml
index 97e64cc2c..ab78f36d3 100644
--- a/chapter06/gcc-inst.xml
+++ b/chapter06/gcc-inst.xml
@@ -11,7 +11,8 @@ are available.</para>
<para>Note: the build of other compilers is not tested by the people
who actively work on LFS.</para>
-<para><screen><userinput>mkdir ../gcc-build &amp;&amp;</userinput>
+<para><screen><userinput>patch -Np1 -i ../gcc-&gcc-version;.patch &amp;&amp;</userinput>
+<userinput>mkdir ../gcc-build &amp;&amp;</userinput>
<userinput>cd ../gcc-build &amp;&amp;</userinput>
<userinput>../gcc-&gcc-version;/configure --prefix=/usr \</userinput>
<userinput>&nbsp;&nbsp;&nbsp;--with-slibdir=/lib --enable-shared \</userinput>
diff --git a/index.xml b/index.xml
index 9eec59385..6f076f459 100644
--- a/index.xml
+++ b/index.xml
@@ -562,8 +562,8 @@
<!ENTITY fileutils-compsize "dynamic-fileutils MB">
<!ENTITY fileutils-time "dynamic-fileutils minutes">
-<!ENTITY gcc-version "3.0">
-<!ENTITY gcc-size "13,402 KB">
+<!ENTITY gcc-version "2.95.3">
+<!ENTITY gcc-size "9,618 KB">
<!ENTITY gcc-patch-size "1 KB">
<!ENTITY gcc-compsize-static "static-gcctotal MB">
<!ENTITY gcc-time-static "static-gcc minutes">