diff options
| -rw-r--r-- | chapter05/gcc-inst.xml | 9 | ||||
| -rw-r--r-- | chapter05/kernel-inst.xml | 2 | ||||
| -rw-r--r-- | chapter05/texinfo-inst.xml | 2 | ||||
| -rw-r--r-- | chapter06/bin86-inst.xml | 3 | ||||
| -rw-r--r-- | chapter06/bin86.xml | 1 | ||||
| -rw-r--r-- | chapter06/gcc-inst.xml | 10 | ||||
| -rw-r--r-- | chapter06/glibc-inst.xml | 12 | ||||
| -rw-r--r-- | chapter06/groff-inst.xml | 3 | ||||
| -rw-r--r-- | chapter06/ncurses-inst.xml | 2 | ||||
| -rw-r--r-- | 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: <blockquote><literallayout> <userinput>mkdir $LFS/usr/src/gcc-build &&</userinput> <userinput>cd $LFS/usr/src/gcc-build &&</userinput> - <userinput>../gcc-2.95.2.1/configure --prefix=/usr \</userinput> - <userinput> --with-gxx-include-dir=/usr/include/g++ - \</userinput> + <userinput>../gcc-&gcc-version;/configure --prefix=/usr \</userinput> <userinput> --enable-languages=c,c++ --disable-nls &&</userinput> <userinput>make -e LDFLAGS=-static bootstrap &&</userinput> - <userinput>make prefix=$LFS/usr local_prefix=$LFS/usr/local - \</userinput> - <userinput> gxx_include_dir=$LFS/usr/include/g++ - install &&</userinput> + <userinput>make prefix=$LFS/usr install &&</userinput> <userinput>cd $LFS/lib &&</userinput> <userinput>ln -s ../usr/bin/cpp &&</userinput> 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: </para> <blockquote><literallayout> + <userinput>patch -Np1 -i ../linux-&kernel-version;.patch + &&</userinput> <userinput>make mrproper &&</userinput> <userinput>yes "" | make config &&</userinput> <userinput>make dep &&</userinput> 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: </para> <blockquote><literallayout> + <userinput>patch -Np1 -i ../texinfo-&texinfo-version;.patch + &&</userinput> <userinput>./configure --prefix=$LFS/usr --disable-nls &&</userinput> <userinput>make LDFLAGS=-static &&</userinput> 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: <blockquote><literallayout> <userinput>make &&</userinput> - <userinput>make INSTALL_OPTS="-m 755" - PREFIX=/usr install</userinput> + <userinput>make PREFIX=/usr install</userinput> </literallayout></blockquote> </sect2> 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 @@ <title>Installing Bin86</title> &c6-bin86-inst; -&c6-bin86-exp; &aa-bin86-desc; </sect1> 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: <blockquote><literallayout> <userinput>mkdir /usr/src/gcc-build &&</userinput> <userinput>cd /usr/src/gcc-build &&</userinput> - <userinput>../gcc-2.95.2.1/configure --prefix=/usr \</userinput> - <userinput> --with-gxx-include-dir=/usr/include/g++ - \</userinput> - <userinput> --enable-shared - --enable-languages=c,c++ &&</userinput> + <userinput>../gcc-&gcc-version;/configure --prefix=/usr \</userinput> + <userinput> --with-slibdir=/lib + --enable-shared \</userinput> + <userinput> --enable-languages=c,c++ + &&</userinput> <userinput>make bootstrap &&</userinput> <userinput>make install</userinput> </literallayout></blockquote> 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 @@ <title>Installation of Glibc</title> <para> -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. </para> @@ -16,15 +16,15 @@ Install Glibc by running the following commands: <userinput>mkdir /usr/src/glibc-build &&</userinput> <userinput>cd /usr/src/glibc-build &&</userinput> <userinput>sed s/"\$(PERL)"/"\/usr\/bin\/perl"/ \</userinput> - <userinput> ../glibc-2.2.1/malloc/Makefile + <userinput> ../glibc-&glibc-version;/malloc/Makefile > tmp~ &&</userinput> - <userinput>mv tmp~ ../glibc-2.2.1/malloc/Makefile && + <userinput>mv tmp~ ../glibc-&glibc-version;/malloc/Makefile && </userinput> - <userinput>sed "s/root/0/" ../glibc-2.2.1/login/Makefile + <userinput>sed "s/root/0/" ../glibc-&glibc-version;/login/Makefile > tmp~ && </userinput> - <userinput>mv tmp~ ../glibc-2.2.1/login/Makefile && + <userinput>mv tmp~ ../glibc-&glibc-version;/login/Makefile && </userinput> - <userinput>../glibc-2.2.1/configure \</userinput> + <userinput>../glibc-&glibc-version;/configure \</userinput> <userinput> --prefix=/usr --enable-add-ons \</userinput> <userinput> --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: </para> <blockquote><literallayout> - <userinput>./configure --prefix=/usr &&</userinput> + <userinput>CXXFLAGS=-Dstrerror=strerror ./configure --prefix=/usr + &&</userinput> <userinput>make &&</userinput> <userinput>make install</userinput> </literallayout></blockquote> 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: </para> <blockquote><literallayout> + <userinput>patch -Np1 -i ../ncurses-&ncurses-version;.patch + &&</userinput> <userinput>./configure --prefix=/usr --libdir=/lib \</userinput> <userinput> --with-shared --disable-termcap &&</userinput> 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: </para> <blockquote><literallayout> + <userinput>patch -Np1 -i ../texinfo-&texinfo-version;.patch + &&</userinput> <userinput>./configure --prefix=/usr &&</userinput> <userinput>make &&</userinput> <userinput>make install &&</userinput> |