note not to remove tcl directory

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

6 files changed, 22 insertions, 19 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 6dc4c1293..43538a6b9 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -11,7 +11,6 @@
 <listitem><para>automake-1.7.4</para></listitem>
 <listitem><para>e2fsprogs-1.33</para></listitem>
 <listitem><para>file-4.02</para></listitem>
-<listitem><para>flex-2.5.31</para></listitem>
 <listitem><para>gawk-3.1.2</para></listitem>
 <listitem><para>gcc-3.2.3</para></listitem>
 <listitem><para>glibc-2.3.2</para></listitem>
@@ -44,8 +43,6 @@
 <listitem><para>gawk-3.1.2.patch</para></listitem>
 <listitem><para>gcc-2.95.3</para></listitem>
 <listitem><para>gcc-2.95.3-2.patch</para></listitem>
-<listitem><para>gcc-3.2.3-libgcc_no_debug.patch</para></listitem>
-<listitem><para>gcc-3.2.3-libstdc++_no_debug.patch</para></listitem>
 <listitem><para>gcc-3.2.3-mmap_test.patch</para></listitem>
 <listitem><para>gcc-3.2.3-no_fixincludes.patch</para></listitem>
 <listitem><para>gcc-3.2.3-specs.patch</para></listitem>
@@ -66,6 +63,16 @@
 </itemizedlist>
 </para></listitem>
 
+<listitem><para>May 7th, 2003 [gerard]: Removed GCC No Debug patches. No
+longer assume gcc-core and gcc-g++ packages are downloaded, so added
+appropriate --enable-languages options.</para></listitem>
+
+<listitem><para>May 7th, 2003 [gerard]: Removed Chapter 6 - Glibc-Pass2.
+It's not needed anymore with the pure-lfs integration.</para></listitem>
+
+<listitem><para>May 7th, 2003 [gerard]: Downgraded to flex-2.5.4a again.
+Newer versions just don't work properly.</para></listitem>
+
 <listitem><para>May 5th, 2003 [gerard]: Removed zlib installation from
 chapter 5 (its inclusion was a mistake).</para></listitem>
 
diff --git a/chapter04/gcc.xml b/chapter04/gcc.xml
index 4f1e2a56d..2a51db9ee 100644
--- a/chapter04/gcc.xml
+++ b/chapter04/gcc.xml
@@ -4,14 +4,8 @@ GCC (&gcc-version;) - &gcc-core-size;:
 GCC Specs Patch:
 <ulink url="&http;/gcc-3.2.3-specs-2.patch"/>
 
-GCC libgcc No Debug Patch:
-<ulink url="&http;/gcc-3.2.3-libgcc_no_debug.patch"/>
-
-GCC libstdc++ No Debug Patch:
-<ulink url="&http;/gcc-3.2.3-libstdc++_no_debug.patch"/>
-
 GCC MMap Test Patch:
 <ulink url="&http;/gcc-3.2.3-mmap_test.patch"/>
 
-GCC No Fixed Includes Patch:
+GCC No Fixincludes Patch:
 <ulink url="&http;/gcc-3.2.3-no_fixincludes.patch"/>
diff --git a/chapter05/gcc-pass1-inst.xml b/chapter05/gcc-pass1-inst.xml
index 8987c0cb8..2cf5349ad 100644
--- a/chapter05/gcc-pass1-inst.xml
+++ b/chapter05/gcc-pass1-inst.xml
@@ -13,9 +13,7 @@ default optimizations, such as CFLAGS and CXXFLAGS, we recommend unsetting
 or modifying them when building GCC.</para>
 
 <para><screen><userinput>patch -Np1 -i ../gcc-&gcc-version;-mmap_test.patch
-patch -Np1 -i ../gcc-&gcc-version;-no_fixincludes.patch
-patch -Np1 -i ../gcc-&gcc-version;-libstdc++_no_debug.patch
-patch -Np1 -i ../gcc-&gcc-version;-libgcc_no_debug.patch</userinput></screen></para>
+patch -Np1 -i ../gcc-&gcc-version;-no_fixincludes.patch</userinput></screen></para>
 
 <para>It is recommended by the GCC installation documentation to build
 GCC outside of the source directory in a dedicated directory:</para>
@@ -28,7 +26,8 @@ cd ../gcc-build</userinput></screen></para>
 <para><screen><userinput>CFLAGS="-O2 -pipe" \
 &nbsp;&nbsp;&nbsp;&nbsp;../gcc-&gcc-version;/configure --prefix=/stage1 \
 &nbsp;&nbsp;&nbsp;&nbsp;--with-local-prefix=/stage1 \
-&nbsp;&nbsp;&nbsp;&nbsp;--disable-nls --enable-shared </userinput></screen></para>
+&nbsp;&nbsp;&nbsp;&nbsp;--disable-nls --enable-shared \
+&nbsp;&nbsp;&nbsp;&nbsp;--enable-languages=c</userinput></screen></para>
 
 <para>The meaning of the configure options are:</para>
 
diff --git a/chapter05/gcc-pass2-inst.xml b/chapter05/gcc-pass2-inst.xml
index 57f775303..1ae4e3728 100644
--- a/chapter05/gcc-pass2-inst.xml
+++ b/chapter05/gcc-pass2-inst.xml
@@ -5,9 +5,7 @@
 
 <para><screen><userinput>patch -Np1 -i ../gcc-&gcc-version;-specs-2.patch
 patch -Np1 -i ../gcc-&gcc-version;-mmap_test.patch
-patch -Np1 -i ../gcc-&gcc-version;-no_fixincludes.patch
-patch -Np1 -i ../gcc-&gcc-version;-libstdc++_no_debug.patch
-patch -Np1 -i ../gcc-&gcc-version;-libgcc_no_debug.patch </userinput></screen></para>
+patch -Np1 -i ../gcc-&gcc-version;-no_fixincludes.patch</userinput></screen></para>
 
 <para><screen><userinput>mkdir ../gcc-build
 cd ../gcc-build</userinput></screen></para>
@@ -16,7 +14,8 @@ cd ../gcc-build</userinput></screen></para>
 &nbsp;&nbsp;&nbsp;&nbsp;../gcc-&gcc-version;/configure --prefix=/stage1 \
 &nbsp;&nbsp;&nbsp;&nbsp;--with-local-prefix=/stage1 \
 &nbsp;&nbsp;&nbsp;&nbsp;--enable-clocale=gnu --enable-shared \
-&nbsp;&nbsp;&nbsp;&nbsp;--enable-threads=posix --enable-__cxa_atexit
+&nbsp;&nbsp;&nbsp;&nbsp;--enable-threads=posix --enable-__cxa_atexit \
+&nbsp;&nbsp;&nbsp;&nbsp;--enable-languages=c,c++
 make LDFLAGS="-s"
 make -k check
 make install</userinput></screen></para>
diff --git a/chapter06/gcc-inst.xml b/chapter06/gcc-inst.xml
index 6b0220d54..0aa8fd173 100644
--- a/chapter06/gcc-inst.xml
+++ b/chapter06/gcc-inst.xml
@@ -31,7 +31,8 @@ cd ../gcc-build</userinput></screen></para>
 &nbsp;&nbsp;&nbsp;&nbsp;--enable-shared --enable-threads=posix \
 &nbsp;&nbsp;&nbsp;&nbsp;--enable-__cxa_atexit --enable-clocale=gnu \
 &nbsp;&nbsp;&nbsp;&nbsp;--mandir=/usr/share/man \
-&nbsp;&nbsp;&nbsp;&nbsp;--infodir=/usr/share/info</userinput></screen></para>
+&nbsp;&nbsp;&nbsp;&nbsp;--infodir=/usr/share/info \
+&nbsp;&nbsp;&nbsp;&nbsp;--enable-languages=c,c++</userinput></screen></para>
 
 <para>The meanings of the configure options are:</para>
 
diff --git a/chapter06/tcl-inst.xml b/chapter06/tcl-inst.xml
index 8d9e87b00..ce96968e5 100644
--- a/chapter06/tcl-inst.xml
+++ b/chapter06/tcl-inst.xml
@@ -10,5 +10,8 @@ make test
 make install
 ln -s tclsh8.4 /usr/bin/tclsh</userinput></screen></para>
 
+<para>Don't remove the tcl&tcl-version; directory yet, you need it for the
+next package installation.</para>
+
 </sect2>