From 84479a6efdd209444715c827c1c4e0d8b672ee1d Mon Sep 17 00:00:00 2001 From: Gerard Beekmans Date: Wed, 20 Jun 2001 04:43:00 +0000 Subject: Updated to current versions git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@685 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- chapter05/gcc-inst.xml | 9 ++------- chapter05/kernel-inst.xml | 2 ++ chapter05/texinfo-inst.xml | 2 ++ chapter06/bin86-inst.xml | 3 +-- chapter06/bin86.xml | 1 - chapter06/gcc-inst.xml | 10 +++++----- chapter06/glibc-inst.xml | 12 ++++++------ chapter06/groff-inst.xml | 3 ++- chapter06/ncurses-inst.xml | 2 ++ chapter06/texinfo-inst.xml | 2 ++ 10 files changed, 24 insertions(+), 22 deletions(-) diff --git a/chapter05/gcc-inst.xml b/chapter05/gcc-inst.xml index c7832bd96..5ff7c5473 100644 --- a/chapter05/gcc-inst.xml +++ b/chapter05/gcc-inst.xml @@ -8,16 +8,11 @@ Install GCC by running the following commands:
mkdir $LFS/usr/src/gcc-build && cd $LFS/usr/src/gcc-build && - ../gcc-2.95.2.1/configure --prefix=/usr \ -    --with-gxx-include-dir=/usr/include/g++ - \ + ../gcc-&gcc-version;/configure --prefix=/usr \    --enable-languages=c,c++ --disable-nls && make -e LDFLAGS=-static bootstrap && - make prefix=$LFS/usr local_prefix=$LFS/usr/local - \ -    gxx_include_dir=$LFS/usr/include/g++ - install && + make prefix=$LFS/usr install && cd $LFS/lib && ln -s ../usr/bin/cpp && diff --git a/chapter05/kernel-inst.xml b/chapter05/kernel-inst.xml index 50ace44bb..a12a517b1 100644 --- a/chapter05/kernel-inst.xml +++ b/chapter05/kernel-inst.xml @@ -14,6 +14,8 @@ The kernel configuration file is created by running the following command:
+ patch -Np1 -i ../linux-&kernel-version;.patch + && make mrproper && yes "" | make config && make dep && diff --git a/chapter05/texinfo-inst.xml b/chapter05/texinfo-inst.xml index 317630604..358f09f66 100644 --- a/chapter05/texinfo-inst.xml +++ b/chapter05/texinfo-inst.xml @@ -6,6 +6,8 @@ Install Texinfo by running the following commands:
+ patch -Np1 -i ../texinfo-&texinfo-version;.patch + && ./configure --prefix=$LFS/usr --disable-nls && make LDFLAGS=-static && diff --git a/chapter06/bin86-inst.xml b/chapter06/bin86-inst.xml index 5cfabbb7c..e4d83eaef 100644 --- a/chapter06/bin86-inst.xml +++ b/chapter06/bin86-inst.xml @@ -7,8 +7,7 @@ Install Bin86 by running the following commands:
make && - make INSTALL_OPTS="-m 755" - PREFIX=/usr install + make PREFIX=/usr install
diff --git a/chapter06/bin86.xml b/chapter06/bin86.xml index 1f4668dbc..a31e9af84 100644 --- a/chapter06/bin86.xml +++ b/chapter06/bin86.xml @@ -2,7 +2,6 @@ Installing Bin86 &c6-bin86-inst; -&c6-bin86-exp; &aa-bin86-desc; diff --git a/chapter06/gcc-inst.xml b/chapter06/gcc-inst.xml index 474455134..575cefedc 100644 --- a/chapter06/gcc-inst.xml +++ b/chapter06/gcc-inst.xml @@ -8,11 +8,11 @@ Install GCC by running the following commands:
mkdir /usr/src/gcc-build && cd /usr/src/gcc-build && - ../gcc-2.95.2.1/configure --prefix=/usr \ -    --with-gxx-include-dir=/usr/include/g++ - \ -    --enable-shared - --enable-languages=c,c++ && + ../gcc-&gcc-version;/configure --prefix=/usr \ +    --with-slibdir=/lib + --enable-shared \ +    --enable-languages=c,c++ + && make bootstrap && make install
diff --git a/chapter06/glibc-inst.xml b/chapter06/glibc-inst.xml index 5a4dbed5a..a8c94ce2a 100644 --- a/chapter06/glibc-inst.xml +++ b/chapter06/glibc-inst.xml @@ -2,7 +2,7 @@ Installation of Glibc -Unpack the glibc-linuxthreads in the glibc-2.2.1 directory, not in +Unpack the glibc-linuxthreads in the glibc-&glibc-version; directory, not in /usr/src. @@ -16,15 +16,15 @@ Install Glibc by running the following commands: mkdir /usr/src/glibc-build && cd /usr/src/glibc-build && sed s/"\$(PERL)"/"\/usr\/bin\/perl"/ \ -    ../glibc-2.2.1/malloc/Makefile +    ../glibc-&glibc-version;/malloc/Makefile > tmp~ && - mv tmp~ ../glibc-2.2.1/malloc/Makefile && + mv tmp~ ../glibc-&glibc-version;/malloc/Makefile && - sed "s/root/0/" ../glibc-2.2.1/login/Makefile + sed "s/root/0/" ../glibc-&glibc-version;/login/Makefile > tmp~ && - mv tmp~ ../glibc-2.2.1/login/Makefile && + mv tmp~ ../glibc-&glibc-version;/login/Makefile && - ../glibc-2.2.1/configure \ + ../glibc-&glibc-version;/configure \    --prefix=/usr --enable-add-ons \    --libexecdir=/usr/bin && diff --git a/chapter06/groff-inst.xml b/chapter06/groff-inst.xml index 1bc083172..fba45efff 100644 --- a/chapter06/groff-inst.xml +++ b/chapter06/groff-inst.xml @@ -6,7 +6,8 @@ Install Groff by running the following commands:
- ./configure --prefix=/usr && + CXXFLAGS=-Dstrerror=strerror ./configure --prefix=/usr + && make && make install
diff --git a/chapter06/ncurses-inst.xml b/chapter06/ncurses-inst.xml index a314c20a4..7d5570dc2 100644 --- a/chapter06/ncurses-inst.xml +++ b/chapter06/ncurses-inst.xml @@ -6,6 +6,8 @@ Install Ncurses by running the following commands:
+ patch -Np1 -i ../ncurses-&ncurses-version;.patch + && ./configure --prefix=/usr --libdir=/lib \    --with-shared --disable-termcap && diff --git a/chapter06/texinfo-inst.xml b/chapter06/texinfo-inst.xml index 0520e1ccf..fee8ec74d 100644 --- a/chapter06/texinfo-inst.xml +++ b/chapter06/texinfo-inst.xml @@ -6,6 +6,8 @@ Install Texinfo by running the following commands:
+ patch -Np1 -i ../texinfo-&texinfo-version;.patch + && ./configure --prefix=/usr && make && make install && -- cgit v1.2.3-54-g00ecf