diff options
| -rw-r--r-- | chapter05/gcc-pass1.xml | 44 | ||||
| -rw-r--r-- | chapter05/gcc-pass2.xml | 24 | ||||
| -rw-r--r-- | chapter06/bash.xml | 6 | ||||
| -rw-r--r-- | chapter06/inetutils.xml | 8 | ||||
| -rw-r--r-- | chapter06/man-db.xml | 10 | ||||
| -rw-r--r-- | chapter06/pkgconfig.xml | 6 | ||||
| -rw-r--r-- | chapter06/procps.xml | 8 | ||||
| -rw-r--r-- | chapter06/util-linux.xml | 2 | ||||
| -rw-r--r-- | prologue/why.xml | 4 |
9 files changed, 55 insertions, 57 deletions
diff --git a/chapter05/gcc-pass1.xml b/chapter05/gcc-pass1.xml index 58a3f770c..7398a810f 100644 --- a/chapter05/gcc-pass1.xml +++ b/chapter05/gcc-pass1.xml @@ -117,28 +117,28 @@ cd ../gcc-build</userinput></screen> <para>Prepare GCC for compilation:</para> -<screen><userinput remap="configure">../gcc-&gcc-version;/configure \ - --target=$LFS_TGT \ - --prefix=/tools \ - --with-sysroot=$LFS \ - --with-newlib \ - --without-headers \ - --with-local-prefix=/tools \ - --with-native-system-header-dir=/tools/include \ - --disable-nls \ - --disable-shared \ - --disable-multilib \ - --disable-decimal-float \ - --disable-threads \ - --disable-libatomic \ - --disable-libgomp \ - --disable-libitm \ - --disable-libquadmath \ - --disable-libsanitizer \ - --disable-libssp \ - --disable-libvtv \ - --disable-libcilkrts \ - --disable-libstdc++-v3 \ +<screen><userinput remap="configure">../gcc-&gcc-version;/configure \ + --target=$LFS_TGT \ + --prefix=/tools \ + --with-sysroot=$LFS \ + --with-newlib \ + --without-headers \ + --with-local-prefix=/tools \ + --with-native-system-header-dir=/tools/include \ + --disable-nls \ + --disable-shared \ + --disable-multilib \ + --disable-decimal-float \ + --disable-threads \ + --disable-libatomic \ + --disable-libgomp \ + --disable-libitm \ + --disable-libquadmath \ + --disable-libsanitizer \ + --disable-libssp \ + --disable-libvtv \ + --disable-libcilkrts \ + --disable-libstdc++-v3 \ --enable-languages=c,c++</userinput></screen> <variablelist> <title>The meaning of the configure options:</title> diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml index fa430f574..e2df1764d 100644 --- a/chapter05/gcc-pass2.xml +++ b/chapter05/gcc-pass2.xml @@ -109,18 +109,18 @@ cd ../gcc-build</userinput></screen> <para>Now prepare GCC for compilation:</para> -<screen><userinput remap="configure">CC=$LFS_TGT-gcc \ -CXX=$LFS_TGT-g++ \ -AR=$LFS_TGT-ar \ -RANLIB=$LFS_TGT-ranlib \ -../gcc-&gcc-version;/configure \ - --prefix=/tools \ - --with-local-prefix=/tools \ - --with-native-system-header-dir=/tools/include \ - --enable-languages=c,c++ \ - --disable-libstdcxx-pch \ - --disable-multilib \ - --disable-bootstrap \ +<screen><userinput remap="configure">CC=$LFS_TGT-gcc \ +CXX=$LFS_TGT-g++ \ +AR=$LFS_TGT-ar \ +RANLIB=$LFS_TGT-ranlib \ +../gcc-&gcc-version;/configure \ + --prefix=/tools \ + --with-local-prefix=/tools \ + --with-native-system-header-dir=/tools/include \ + --enable-languages=c,c++ \ + --disable-libstdcxx-pch \ + --disable-multilib \ + --disable-bootstrap \ --disable-libgomp</userinput></screen> <variablelist> diff --git a/chapter06/bash.xml b/chapter06/bash.xml index 72e36e32a..73c67129a 100644 --- a/chapter06/bash.xml +++ b/chapter06/bash.xml @@ -47,10 +47,10 @@ <para>Prepare Bash for compilation:</para> -<screen><userinput remap="configure">./configure --prefix=/usr \ - --bindir=/bin \ +<screen><userinput remap="configure">./configure --prefix=/usr \ + --bindir=/bin \ --docdir=/usr/share/doc/bash-&bash-version; \ - --without-bash-malloc \ + --without-bash-malloc \ --with-installed-readline</userinput></screen> <variablelist> diff --git a/chapter06/inetutils.xml b/chapter06/inetutils.xml index d739aee0b..748d5bef7 100644 --- a/chapter06/inetutils.xml +++ b/chapter06/inetutils.xml @@ -47,10 +47,10 @@ <para>Prepare Inetutils for compilation:</para> -<screen><userinput remap="configure">./configure --prefix=/usr \ - --localstatedir=/var \ - --disable-logger \ - --disable-whois \ +<screen><userinput remap="configure">./configure --prefix=/usr \ + --localstatedir=/var \ + --disable-logger \ + --disable-whois \ --disable-servers</userinput></screen> <variablelist> diff --git a/chapter06/man-db.xml b/chapter06/man-db.xml index 84d932df0..d876a8f3d 100644 --- a/chapter06/man-db.xml +++ b/chapter06/man-db.xml @@ -43,12 +43,12 @@ <para>Prepare Man-DB for compilation:</para> -<screen><userinput remap="configure">./configure --prefix=/usr \ +<screen><userinput remap="configure">./configure --prefix=/usr \ --docdir=/usr/share/doc/man-db-&man-db-version; \ - --sysconfdir=/etc \ - --disable-setuid \ - --with-browser=/usr/bin/lynx \ - --with-vgrind=/usr/bin/vgrind \ + --sysconfdir=/etc \ + --disable-setuid \ + --with-browser=/usr/bin/lynx \ + --with-vgrind=/usr/bin/vgrind \ --with-grap=/usr/bin/grap</userinput></screen> <variablelist> diff --git a/chapter06/pkgconfig.xml b/chapter06/pkgconfig.xml index ee2214c37..eb9278d18 100644 --- a/chapter06/pkgconfig.xml +++ b/chapter06/pkgconfig.xml @@ -44,9 +44,9 @@ <para>Prepare Pkg-config for compilation:</para> -<screen><userinput remap="configure">./configure --prefix=/usr \ - --with-internal-glib \ - --disable-host-tool \ +<screen><userinput remap="configure">./configure --prefix=/usr \ + --with-internal-glib \ + --disable-host-tool \ --docdir=/usr/share/doc/pkg-config-&pkgconfig-version;</userinput></screen> <variablelist> diff --git a/chapter06/procps.xml b/chapter06/procps.xml index b8fb4182f..7baf9d7cc 100644 --- a/chapter06/procps.xml +++ b/chapter06/procps.xml @@ -42,11 +42,11 @@ <para>Now prepare procps-ng for compilation:</para> -<screen><userinput remap="configure">./configure --prefix=/usr \ - --exec-prefix= \ - --libdir=/usr/lib \ +<screen><userinput remap="configure">./configure --prefix=/usr \ + --exec-prefix= \ + --libdir=/usr/lib \ --docdir=/usr/share/doc/procps-ng-&procps-ng-version; \ - --disable-static \ + --disable-static \ --disable-kill</userinput></screen> <variablelist> diff --git a/chapter06/util-linux.xml b/chapter06/util-linux.xml index 54cb943ae..50faa410e 100644 --- a/chapter06/util-linux.xml +++ b/chapter06/util-linux.xml @@ -62,7 +62,7 @@ --> <para>Prepare Util-linux for compilation:</para> -<screen><userinput remap="configure">./configure ADJTIME_PATH=/var/lib/hwclock/adjtime \ +<screen><userinput remap="configure">./configure ADJTIME_PATH=/var/lib/hwclock/adjtime \ --docdir=/usr/share/doc/util-linux-&util-linux-version; \ --disable-chfn-chsh \ --disable-login \ diff --git a/prologue/why.xml b/prologue/why.xml index 453726ae5..e4ea59a5d 100644 --- a/prologue/why.xml +++ b/prologue/why.xml @@ -463,9 +463,7 @@ <para>This package provides and <application>init</application> program and several additional boot and system control capabilites as an - alternative to Sysvinit. It is used by many commercial distributions. - In LFS it is installed side-by-side with Sysvinit to provide the user with - alternative boot systems for comparison.</para> + alternative to Sysvinit. It is used by many Linux distributions.</para> </listitem> <listitem> |