From f6810d47a98a74bc11a1787843e10a32ab7eea27 Mon Sep 17 00:00:00 2001 From: Gerard Beekmans Date: Mon, 27 May 2002 03:17:49 +0000 Subject: 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 --- chapter06/file-exp.xml | 11 ----------- chapter06/file-inst.xml | 3 +-- chapter06/file.xml | 1 - chapter06/findutils-inst.xml | 2 +- chapter06/gcc-inst.xml | 10 ++++------ chapter06/ncurses-exp.xml | 5 +++++ chapter06/ncurses-inst.xml | 3 ++- chapter06/perl-exp.xml | 8 ++++++++ chapter06/perl-inst.xml | 3 ++- chapter06/perl.xml | 1 + chapter06/vim-exp.xml | 3 +++ chapter06/vim-inst.xml | 3 ++- 12 files changed, 29 insertions(+), 24 deletions(-) delete mode 100644 chapter06/file-exp.xml create mode 100644 chapter06/perl-exp.xml (limited to 'chapter06') 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 @@ - -Command explanations - -touch aclocal.m4 configure Makefile.in stamp-h.in: -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. - - - 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 @@ Install File by running the following commands: -touch aclocal.m4 configure Makefile.in stamp-h.in && -./configure --prefix=/usr --datadir=/usr/share/misc && +./configure --prefix=/usr --datadir=/usr/share/misc && make && make install 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; &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. Install Findutils by running the following commands: -patch -Np1 -i ../findutils-4.1.patch && +patch -Np1 -i ../findutils-&findutils-version;.patch && ./configure --prefix=/usr && make libexecdir=/usr/bin && make libexecdir=/usr/bin install 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. Note: the build of other compilers is not tested by the people who actively work on LFS. -patch -Np1 -i ../gcc-&gcc-patch-version;.patch && -mkdir ../gcc-build && +mkdir ../gcc-build && cd ../gcc-build && ../gcc-&gcc-version;/configure --prefix=/usr --enable-shared \ -    --enable-languages=c,c++ --enable-threads=posix && +    --enable-languages=c,c++ --enable-threads=posix \ +    --with-slibdir=/lib && make bootstrap && make install && ln -sf ../usr/bin/cpp /lib && ln -sf ../bin/cpp /usr/lib && -ln -sf gcc /usr/bin/cc && -rmdir /usr/*-gnu/include && -rmdir /usr/*-gnu +ln -sf gcc /usr/bin/cc 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 @@ Command explanations +patch -Np1 -i +../ncurses-&ncurses-version;-patch: This patch fixes a compile +problem with GCC-3.1 because Ncurses uses constructions that are no longer +valid in the new C++ standard. + --with-shared: This enables the build of the shared ncurses library files. 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 @@ Install Ncurses by running the following commands: -./configure --prefix=/usr --libdir=/lib \ +patch -Np1 -i ../ncurses-&ncurses-version;-patch && +./configure --prefix=/usr --libdir=/lib \     --with-shared --disable-termcap && make && make install && 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 @@ + +Command explanations + +patch -Np1 -i ../perl-&perl-version;.patch: This +patch fixes a compile problem with GCC-3.1. + + + 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 @@ Install Perl by running the following commands: -./configure.gnu --prefix=/usr && +patch -Np1 -i ../perl-&perl-version;.patch && +./configure.gnu --prefix=/usr && make && make install 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; &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 @@ Command explanations +patch -Np1 -i ../vim-&vim-version;.patch: This +patch fixes a compile problem with GCC-3.1. + make CPPFLAGS=-DSYS_VIMRC_FILE=\\\"/etc/vimrc\\\": Setting this will cause vim to look for the /etc/vimrc 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. Install Vim by running the following commands: -./configure --prefix=/usr && +patch -Np1 -i ../vim-&vim-version;.patch && +./configure --prefix=/usr && make CPPFLAGS=-DSYS_VIMRC_FILE=\\\"/etc/vimrc\\\" && make install && ln -sf vim /usr/bin/vi -- cgit v1.2.3-54-g00ecf