rm /bin/bash after makedev, re-added HAVE_GAS_HIDDEN, removed --enable-__cxa-atexit

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

13 files changed, 47 insertions, 18 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index c1d4b0db8..283d73073 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -52,6 +52,15 @@
 </itemizedlist>
 </para></listitem>
 
+<listitem><para>August 30th, 2002 [timothy]: Chapter 06 - Makedev:
+Put rm /bin/bash after device creation. Perl: Removed information
+about the old patch.</para></listitem>
+
+<listitem><para>August 30th, 2002 [timothy]: Chapter 05 - GCC: Re-added
+HAVE_GAS_HIDDEN; removed --enable-__cxa-atexit which was incorrect and
+not needed in this chapter; added information about the
+patch.</para></listitem>
+
 <listitem><para>August 26th, 2002 [gerard]: Added a new Glibc patch and
 introducted a GCC patch.</para></listitem>
 
diff --git a/chapter05/gcc-exp.xml b/chapter05/gcc-exp.xml
index 2078f8a1d..91d47bdd6 100644
--- a/chapter05/gcc-exp.xml
+++ b/chapter05/gcc-exp.xml
@@ -19,9 +19,9 @@ the --enable-languages parameter may be omitted.</para>
 <para><userinput>--enable-threads=posix:</userinput> This enables C++ 
 exception handling for multithreaded code.</para>
 
-<para><userinput>--enable-__cxa-atexit:</userinput> This option will result
-in C++ shared libraries and C++ programs that are interoperable with other
-linux distributions.</para>
+<para><userinput>echo "#define HAVE_GAS_HIDDEN 1":</userinput>
+This defines the .hidden assembler directive so that we don't build
+a faulty Glibc later on.</para>
 
 <para><userinput>make BOOT_LDFLAGS=-static:</userinput>
 This is the equivalent to make LDFLAGS=-static as we use with other
diff --git a/chapter05/gcc-inst.xml b/chapter05/gcc-inst.xml
index 021dd9b03..661726347 100644
--- a/chapter05/gcc-inst.xml
+++ b/chapter05/gcc-inst.xml
@@ -1,6 +1,10 @@
 <sect2>
 <title>Installation of GCC</title>
 
+<para>This package requires its patch to be applied before you can
+install it. Make sure it's unpacked before running the installation
+commands.</para>
+
 <para>This package is known to behave badly when you have changed its
 default optimization flags (including the -march and -mcpu options). GCC is
 best left alone.  Therefore, if you have defined any environment variables
@@ -14,8 +18,8 @@ been warned.</para>
 mkdir ../gcc-build &amp;&amp;
 cd ../gcc-build &amp;&amp;
 ../gcc-&gcc-version;/configure --prefix=/static --enable-languages=c \
-&nbsp;&nbsp;&nbsp;--disable-nls --disable-shared --enable-threads=posix \
-&nbsp;&nbsp;&nbsp;--enable-__cxa-atexit &amp;&amp;
+&nbsp;&nbsp;&nbsp;--disable-nls --disable-shared --enable-threads=posix &amp;&amp;
+echo "#define HAVE_GAS_HIDDEN 1" >> gcc/auto-host.h &amp;&amp;
 make BOOT_LDFLAGS=-static bootstrap &amp;&amp;
 make prefix=$LFS/static install &amp;&amp;
 ln -s gcc $LFS/static/bin/cc</userinput></screen></para>
diff --git a/chapter05/introduction.xml b/chapter05/introduction.xml
index 34fbefa1d..0d1cbac41 100644
--- a/chapter05/introduction.xml
+++ b/chapter05/introduction.xml
@@ -24,6 +24,10 @@ exactly what each package is used for, and why the user or the system
 needs it. For this purpose a short description of the content of each
 package is given right after the installation instructions.</para>
 
+<para>Many of our packages must be patched before they can be compiled.
+We only apply patches when and where they are needed. So, don't fret if
+seems like instructions for a patch are missing.</para>
+
 <para>During the installation of several packages you will probably
 see all kinds of compiler warnings scroll by on your screen. These are
 normal and can be safely ignored. They are just what they say they are:
diff --git a/chapter06/gcc-exp.xml b/chapter06/gcc-exp.xml
new file mode 100644
index 000000000..b05214795
--- /dev/null
+++ b/chapter06/gcc-exp.xml
@@ -0,0 +1,9 @@
+<sect2>
+<title>Command explanations</title>
+
+<para><userinput>--enable-__cxa_atexit:</userinput> This option will result
+in C++ shared libraries and C++ programs that are interoperable with other
+linux distributions.</para>
+
+</sect2>
+
diff --git a/chapter06/gcc-inst.xml b/chapter06/gcc-inst.xml
index 60a486886..a3a024a4f 100644
--- a/chapter06/gcc-inst.xml
+++ b/chapter06/gcc-inst.xml
@@ -1,6 +1,10 @@
 <sect2>
 <title>Installation of GCC</title>
 
+<para>This package requires its patch to be applied before you can
+install it. Make sure it's unpacked before running the installation
+commands.</para>
+
 <para>This package is known to behave badly when you have changed its
 default optimization flags (including the -march and -mcpu options). GCC is
 best left alone.  Therefore, if you have defined any environment variables
@@ -23,7 +27,7 @@ mkdir ../gcc-build &amp;&amp;
 cd ../gcc-build &amp;&amp;
 ../gcc-&gcc-version;/configure --prefix=/usr --enable-shared \
 &nbsp;&nbsp;&nbsp;&nbsp;--enable-languages=c,c++ --enable-threads=posix \
-&nbsp;&nbsp;&nbsp;&nbsp;--with-slibdir=/lib --enable-_cxa-atexit &amp;&amp;
+&nbsp;&nbsp;&nbsp;&nbsp;--with-slibdir=/lib --enable-__cxa_atexit &amp;&amp;
 make bootstrap &amp;&amp;
 make install &amp;&amp;
 ln -s ../usr/bin/cpp /lib &amp;&amp;
diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml
index fc6faaa70..a58451300 100644
--- a/chapter06/gcc.xml
+++ b/chapter06/gcc.xml
@@ -6,6 +6,7 @@
 Estimated required disk space:  &gcc-compsize;</screen>
 
 &c6-gcc-inst;
+&c6-gcc-exp;
 &aa-gcc-desc;
 &aa-gcc-dep;
 
diff --git a/chapter06/makedev-inst.xml b/chapter06/makedev-inst.xml
index a4d56ff7b..6fa63a064 100644
--- a/chapter06/makedev-inst.xml
+++ b/chapter06/makedev-inst.xml
@@ -9,17 +9,18 @@ won't create a directory for you to cd into.</para>
 <para><screen><userinput>ln -s /static/bin/bash /bin/bash &amp;&amp;
 cp MAKEDEV-&makedev-version; /dev/MAKEDEV &amp;&amp;
 cd /dev &amp;&amp;
-chmod 754 MAKEDEV &amp;&amp;
-rm /bin/bash</userinput></screen></para>
+chmod 754 MAKEDEV</userinput></screen></para>
 
 <para>Now, depending on whether you are going to use devpts or not, you
 can run one of two commands:</para>
 
 <para>If you do not intend to use devpts, run:</para>
-<para><screen><userinput>./MAKEDEV -v generic</userinput></screen></para>
+<para><screen><userinput>./MAKEDEV -v generic &amp;&amp;
+rm /bin/bash</userinput></screen></para>
 
 <para>If you do intend to use devpts, then run:</para>
-<para><screen><userinput>./MAKEDEV -v generic-nopty</userinput></screen></para>
+<para><screen><userinput>./MAKEDEV -v generic-nopty &amp;&amp;
+rm /bin/bash</userinput></screen></para>
 
 <para>Note that if you aren't sure, it's best to use 
 the <userinput>./MAKEDEV -v generic</userinput> command as this will
diff --git a/chapter06/ncurses-exp.xml b/chapter06/ncurses-exp.xml
index f393f9db5..1e9c7d516 100644
--- a/chapter06/ncurses-exp.xml
+++ b/chapter06/ncurses-exp.xml
@@ -3,7 +3,7 @@
 
 <para><userinput>patch -Np1 -i
 ../ncurses-&ncurses-version;-patch:</userinput> This patch fixes a compile
-problem with GCC-3.1 because Ncurses uses constructions that are no longer
+problem with GCC-3.2 because Ncurses uses constructions that are no longer
 valid in the new C++ standard.</para>
 
 <para><userinput>--with-shared:</userinput> This enables the build of the
diff --git a/chapter06/perl-inst.xml b/chapter06/perl-inst.xml
index ef3fa7bbe..66b067ed2 100644
--- a/chapter06/perl-inst.xml
+++ b/chapter06/perl-inst.xml
@@ -1,10 +1,6 @@
 <sect2>
 <title>Installation of Perl</title>
 
-<para>This package requires its patch to be applied before you can
-install it. Make sure it's unpacked before running the installation 
-commands.</para>
-
 <para>Install Perl by running the following commands:</para>
 
 <para><screen><userinput>./configure.gnu --prefix=/usr &amp;&amp;
diff --git a/chapter06/vim-exp.xml b/chapter06/vim-exp.xml
index 570141334..a95c2f902 100644
--- a/chapter06/vim-exp.xml
+++ b/chapter06/vim-exp.xml
@@ -2,7 +2,7 @@
 <title>Command explanations</title>
 
 <para><userinput>patch -Np1 -i ../vim-&vim-version;.patch:</userinput> This
-patch fixes a compile problem with GCC-3.1.</para>
+patch fixes a compile problem with GCC-3.2.</para>
 
 <para><userinput>make
 CPPFLAGS=-DSYS_VIMRC_FILE=\\\"/etc/vimrc\\\":</userinput> Setting this will
diff --git a/entities/gcc.ent b/entities/gcc.ent
index 31f92a3ac..274447953 100644
--- a/entities/gcc.ent
+++ b/entities/gcc.ent
@@ -7,6 +7,7 @@
 
 <!ENTITY c6-gcc SYSTEM "../chapter06/gcc.xml">
 <!ENTITY c6-gcc-inst SYSTEM "../chapter06/gcc-inst.xml">
+<!ENTITY c6-gcc-exp SYSTEM "../chapter06/gcc-exp.xml">
 
 <!ENTITY aa-gcc SYSTEM "../appendixa/gcc.xml">
 <!ENTITY aa-gcc-desc SYSTEM "../appendixa/gcc-desc.xml">
diff --git a/index.xml b/index.xml
index b42f4f1da..b1bade67c 100644
--- a/index.xml
+++ b/index.xml
@@ -4,8 +4,8 @@
 
 <!ENTITY book SYSTEM "book/book.xml">
 
-<!ENTITY version "20020827">
-<!ENTITY releasedate "August 27th, 2002">
+<!ENTITY version "20020830">
+<!ENTITY releasedate "August 30th, 2002">
 
 <!ENTITY ftp-root "ftp://ftp.linuxfromscratch.org">
 <!ENTITY http-root "http://ftp.linuxfromscratch.org">