Upgraded to: automake-1.6.1, bin86-0.16.3, file-3.38, gawk-3.1.1, gcc-3.1, gettext-0.11.2, modutils-2.4.16, psmisc-21 and util-linux-2.11r. Added gcc-3.1 compile fix patches for ncurses, perl and vim

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

12 files changed, 29 insertions, 24 deletions

diff --git a/chapter06/file-exp.xml b/chapter06/file-exp.xml
deleted file mode 100644
index b2a69083c..000000000
--- a/chapter06/file-exp.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<sect2>
-<title>Command explanations</title>
-
-<para><userinput>touch aclocal.m4 configure Makefile.in stamp-h.in</userinput>:
-This command works around an error which occurs when compiling file with
-automake-1.5 installed by changing the modification dates of some files to
-the current date. Changing the date will cause make to think the files are
-already up-to-date so they're not recreated.</para>
-
-</sect2>
-
diff --git a/chapter06/file-inst.xml b/chapter06/file-inst.xml
index 43696cf9a..a985f51b6 100644
--- a/chapter06/file-inst.xml
+++ b/chapter06/file-inst.xml
@@ -3,8 +3,7 @@
 
 <para>Install File by running the following commands:</para>
 
-<para><screen><userinput>touch aclocal.m4 configure Makefile.in stamp-h.in &amp;&amp;
-./configure --prefix=/usr --datadir=/usr/share/misc &amp;&amp;
+<para><screen><userinput>./configure --prefix=/usr --datadir=/usr/share/misc &amp;&amp;
 make &amp;&amp;
 make install</userinput></screen></para>
 
diff --git a/chapter06/file.xml b/chapter06/file.xml
index 81f9224e2..974f27630 100644
--- a/chapter06/file.xml
+++ b/chapter06/file.xml
@@ -6,7 +6,6 @@
 Estimated required disk space:  &file-compsize;</screen>
 
 &c6-file-inst;
-&c6-file-exp;
 &aa-file-desc;
 &aa-file-dep;
 
diff --git a/chapter06/findutils-inst.xml b/chapter06/findutils-inst.xml
index 543269f3a..b8c48bdf0 100644
--- a/chapter06/findutils-inst.xml
+++ b/chapter06/findutils-inst.xml
@@ -7,7 +7,7 @@ commands.</para>
 
 <para>Install Findutils by running the following commands:</para>
 
-<para><screen><userinput>patch -Np1 -i ../findutils-4.1.patch &amp;&amp;
+<para><screen><userinput>patch -Np1 -i ../findutils-&findutils-version;.patch &amp;&amp;
 ./configure --prefix=/usr &amp;&amp;
 make libexecdir=/usr/bin &amp;&amp;
 make libexecdir=/usr/bin install</userinput></screen></para>
diff --git a/chapter06/gcc-inst.xml b/chapter06/gcc-inst.xml
index 33eaee7f7..35eab2365 100644
--- a/chapter06/gcc-inst.xml
+++ b/chapter06/gcc-inst.xml
@@ -22,18 +22,16 @@ 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>patch -Np1 -i ../gcc-&gcc-patch-version;.patch &amp;&amp;
-mkdir ../gcc-build &amp;&amp;
+<para><screen><userinput>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 &amp;&amp;
+&nbsp;&nbsp;&nbsp;&nbsp;--enable-languages=c,c++ --enable-threads=posix \
+&nbsp;&nbsp;&nbsp;&nbsp;--with-slibdir=/lib &amp;&amp;
 make bootstrap &amp;&amp;
 make install &amp;&amp;
 ln -sf ../usr/bin/cpp /lib &amp;&amp;
 ln -sf ../bin/cpp /usr/lib &amp;&amp;
-ln -sf gcc /usr/bin/cc &amp;&amp;
-rmdir /usr/*-gnu/include &amp;&amp;
-rmdir /usr/*-gnu</userinput></screen></para>
+ln -sf gcc /usr/bin/cc</userinput></screen></para>
 
 </sect2>
 
diff --git a/chapter06/ncurses-exp.xml b/chapter06/ncurses-exp.xml
index f7fb2ef06..4145f8481 100644
--- a/chapter06/ncurses-exp.xml
+++ b/chapter06/ncurses-exp.xml
@@ -1,6 +1,11 @@
 <sect2>
 <title>Command explanations</title>
 
+<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
+valid in the new C++ standard.</para>
+
 <para><userinput>--with-shared:</userinput> This enables the build of the
 shared ncurses library files.</para>
 
diff --git a/chapter06/ncurses-inst.xml b/chapter06/ncurses-inst.xml
index 26b9cb05c..226d0392a 100644
--- a/chapter06/ncurses-inst.xml
+++ b/chapter06/ncurses-inst.xml
@@ -3,7 +3,8 @@
 
 <para>Install Ncurses by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=/usr --libdir=/lib \
+<para><screen><userinput>patch -Np1 -i ../ncurses-&ncurses-version;-patch &amp;&amp;
+./configure --prefix=/usr --libdir=/lib \
 &nbsp;&nbsp;&nbsp;&nbsp;--with-shared --disable-termcap &amp;&amp;
 make &amp;&amp;
 make install &amp;&amp;
diff --git a/chapter06/perl-exp.xml b/chapter06/perl-exp.xml
new file mode 100644
index 000000000..01b4140c7
--- /dev/null
+++ b/chapter06/perl-exp.xml
@@ -0,0 +1,8 @@
+<sect2>
+<title>Command explanations</title>
+
+<para><userinput>patch -Np1 -i ../perl-&perl-version;.patch:</userinput> This
+patch fixes a compile problem with GCC-3.1.</para>
+
+</sect2>
+
diff --git a/chapter06/perl-inst.xml b/chapter06/perl-inst.xml
index 66b067ed2..313fcf3fc 100644
--- a/chapter06/perl-inst.xml
+++ b/chapter06/perl-inst.xml
@@ -3,7 +3,8 @@
 
 <para>Install Perl by running the following commands:</para>
 
-<para><screen><userinput>./configure.gnu --prefix=/usr &amp;&amp;
+<para><screen><userinput>patch -Np1 -i ../perl-&perl-version;.patch &amp;&amp;
+./configure.gnu --prefix=/usr &amp;&amp;
 make &amp;&amp;
 make install</userinput></screen></para>
 
diff --git a/chapter06/perl.xml b/chapter06/perl.xml
index 5a56590ef..33b87163a 100644
--- a/chapter06/perl.xml
+++ b/chapter06/perl.xml
@@ -6,6 +6,7 @@
 Estimated required disk space:  &perl-compsize;</screen>
 
 &c6-perl-inst;
+&c6-perl-exp;
 &aa-perl-desc;
 &aa-perl-dep;
 
diff --git a/chapter06/vim-exp.xml b/chapter06/vim-exp.xml
index 62af4675a..570141334 100644
--- a/chapter06/vim-exp.xml
+++ b/chapter06/vim-exp.xml
@@ -1,6 +1,9 @@
 <sect2>
 <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>
+
 <para><userinput>make
 CPPFLAGS=-DSYS_VIMRC_FILE=\\\"/etc/vimrc\\\":</userinput> Setting this will
 cause vim to look for the <filename>/etc/vimrc</filename> file that
diff --git a/chapter06/vim-inst.xml b/chapter06/vim-inst.xml
index e7e46a57a..69979fb86 100644
--- a/chapter06/vim-inst.xml
+++ b/chapter06/vim-inst.xml
@@ -9,7 +9,8 @@ which are currently available are for Emacs, Joe and nano.</para>
 
 <para>Install Vim by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
+<para><screen><userinput>patch -Np1 -i ../vim-&vim-version;.patch &amp;&amp;
+./configure --prefix=/usr &amp;&amp;
 make CPPFLAGS=-DSYS_VIMRC_FILE=\\\"/etc/vimrc\\\" &amp;&amp;
 make install &amp;&amp;
 ln -sf vim /usr/bin/vi</userinput></screen></para>