From 56029fbfe45458edd08c306b754a4fb1bb9a8468 Mon Sep 17 00:00:00 2001
From: Jeremy Utley <jeremy@linuxfromscratch.org>
Date: Wed, 10 Sep 2003 00:17:44 +0000
Subject: Removed installation of gcc 2.95.3 c++ compiler, added Zack's patch
 to fix the return-type problem

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@2759 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml     | 3 +++
 chapter04/chapter04.xml     | 6 ++++++
 chapter06/gcc-2953-inst.xml | 9 ++-------
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index c2fb63e8c..71fa65bea 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -83,6 +83,9 @@
 </itemizedlist>
 </para></listitem>
 
+<listitem><para>September 9th, 2003 [jeremy]: Chapter 6 - GCC 2.95.3:
+Removed compilation of C++, added Zack's return-type patch.</para></listitem>
+
 <listitem><para>September 9th, 2003 [jeremy]: Chapter 6 - Coreutils:
 Added coreutils-5.0-hostname-2.patch, which suppresses the build of the
 hostname binary, and also suppresses it's check.</para></listitem>
diff --git a/chapter04/chapter04.xml b/chapter04/chapter04.xml
index 33999d581..5b5b5cea6 100644
--- a/chapter04/chapter04.xml
+++ b/chapter04/chapter04.xml
@@ -249,6 +249,12 @@ GCC No Fixincludes Patch:
 GCC Specs Patch:
 <ulink url="&http;/gcc-3.3.1-specs-1.patch"/>
 
+GCC-2 Patch:
+<ulink url="&http;/gcc-2.95.3-2.patch"/>
+
+GCC-2 Return-type Patch:
+<ulink url="&http;/gcc-2.95.3-returntype-fix.patch"/>
+
 Glibc Sscanf Patch:
 <ulink url="&http;/glibc-2.3.2-sscanf-1.patch"/>
 
diff --git a/chapter06/gcc-2953-inst.xml b/chapter06/gcc-2953-inst.xml
index 9d4bd5d17..33493b269 100644
--- a/chapter06/gcc-2953-inst.xml
+++ b/chapter06/gcc-2953-inst.xml
@@ -10,20 +10,15 @@ default optimizations, such as CFLAGS and CXXFLAGS, we recommend unsetting
 or modifying them when building GCC.</para>
 
 <para><screen><userinput>patch -Np1 -i ../gcc-2.95.3-2.patch
+patch -Np1 -i ../gcc-2.95.3-returntype-fix.patch
 echo timestamp > gcc/cstamp-h.in
 mkdir ../gcc-2-build
 cd ../gcc-2-build
 ../gcc-2.95.3/configure --prefix=/opt/gcc-2.95.3 \
-&nbsp;&nbsp;&nbsp;&nbsp;--enable-shared --enable-languages=c,c++ \
+&nbsp;&nbsp;&nbsp;&nbsp;--enable-shared --enable-languages=c \
 &nbsp;&nbsp;&nbsp;&nbsp;--enable-threads=posix
 make bootstrap
 make install</userinput></screen></para>
 
-<para>Add the compiler's library directory to <filename>ld.so.conf</filename>,
-so these libraries can be found at run time:</para>
-
-<para><screen><userinput>echo "/opt/gcc-2.95.3/lib" >> /etc/ld.so.conf
-ldconfig</userinput></screen></para>
-
 </sect2>
 
-- 
cgit v1.2.3-54-g00ecf