gronod/lfs
1
0
Fork 0
mirror of https://git.linuxfromscratch.org/lfs.git synced 2025-03-05 22:04:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add whitespace for better readability of instructions

Browse Source 
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9771 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
This commit is contained in:
Bruce Dubbs 2012-03-09 20:12:34 +00:00
parent eb1ffed9b2
commit 9f5aaf72b2
26 changed files with 144 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
chapter05/binutils-pass1.xml
View File

@ -72,9 +72,10 @@ cd ../binutils-build</userinput></screen>
<para>Now prepare Binutils for compilation:</para>
<screen><userinput remap="configure">../binutils-&binutils-version;/configure \
--target=$LFS_TGT --prefix=/tools \
--disable-nls --disable-werror</userinput></screen>
<screen><userinput remap="configure">../binutils-&binutils-version;/configure --target=$LFS_TGT \
--prefix=/tools \
--disable-nls \
--disable-werror</userinput></screen>
<variablelist>
<title>The meaning of the configure options:</title>

9
chapter05/binutils-pass2.xml
View File

@ -51,9 +51,12 @@ cd ../binutils-build</userinput></screen>
<para>Prepare Binutils for compilation:</para>
<screen><userinput remap="configure">CC="$LFS_TGT-gcc -B/tools/lib/" \
AR=$LFS_TGT-ar RANLIB=$LFS_TGT-ranlib \
../binutils-&binutils-version;/configure --prefix=/tools \
--disable-nls --with-lib-path=/tools/lib</userinput></screen>
AR=$LFS_TGT-ar \
RANLIB=$LFS_TGT-ranlib \
../binutils-&binutils-version;/configure \
--prefix=/tools \
--disable-nls \
--with-lib-path=/tools/lib</userinput></screen>
<variablelist>
<title>The meaning of the new configure options:</title>

28
chapter05/gcc-pass1.xml
View File

@ -76,14 +76,23 @@ cd ../gcc-build</userinput></screen>
<para>Prepare GCC for compilation:</para>
<screen><userinput remap="configure">../gcc-&gcc-version;/configure \
--target=$LFS_TGT --prefix=/tools \
--disable-nls --disable-shared --disable-multilib \
--disable-decimal-float --disable-threads \
--disable-libmudflap --disable-libssp \
--disable-libgomp --disable-libquadmath \
--disable-target-libiberty --disable-target-zlib \
--enable-languages=c --without-ppl --without-cloog \
<screen><userinput remap="configure">../gcc-&gcc-version;/configure \
--target=$LFS_TGT \
--prefix=/tools \
--disable-nls \
--disable-shared \
--disable-multilib \
--disable-decimal-float \
--disable-threads \
--disable-libmudflap \
--disable-libssp \
--disable-libgomp \
--disable-libquadmath \
--disable-target-libiberty \
--disable-target-zlib \
--enable-languages=c \
--without-ppl \
--without-cloog \
--with-mpfr-include=$(pwd)/../gcc-&gcc-version;/mpfr/src \
--with-mpfr-lib=$(pwd)/mpfr/src/.libs</userinput></screen>
@ -159,8 +168,7 @@ cd ../gcc-build</userinput></screen>
since that file will end up containing the objects normally contained in
<filename>libgcc_eh.a</filename>:</para>
<screen><userinput remap="install">ln -vs libgcc.a `$LFS_TGT-gcc -print-libgcc-file-name | \
sed 's/libgcc/&amp;_eh/'`</userinput></screen>
<screen><userinput remap="install">ln -vs libgcc.a `$LFS_TGT-gcc -print-libgcc-file-name | sed 's/libgcc/&amp;_eh/'`</userinput></screen>
</sect2>

24
chapter05/gcc-pass2.xml
View File

@ -150,14 +150,22 @@ cd ../gcc-build</userinput></screen>
<para>Now prepare GCC for compilation:</para>
<screen><userinput remap="configure">CC="$LFS_TGT-gcc -B/tools/lib/" \
AR=$LFS_TGT-ar RANLIB=$LFS_TGT-ranlib \
../gcc-&gcc-version;/configure --prefix=/tools \
--with-local-prefix=/tools --enable-clocale=gnu \
--enable-shared --enable-threads=posix \
--enable-__cxa_atexit --enable-languages=c,c++ \
--disable-libstdcxx-pch --disable-multilib \
--disable-bootstrap --disable-libgomp \
--without-ppl --without-cloog \
AR=$LFS_TGT-ar \
RANLIB=$LFS_TGT-ranlib \
../gcc-&gcc-version;/configure \
--prefix=/tools \
--with-local-prefix=/tools \
--enable-clocale=gnu \
--enable-shared \
--enable-threads=posix \
--enable-__cxa_atexit \
--enable-languages=c,c++ \
--disable-libstdcxx-pch \
--disable-multilib \
--disable-bootstrap \
--disable-libgomp \
--without-ppl \
--without-cloog \
--with-mpfr-include=$(pwd)/../gcc-&gcc-version;/mpfr/src \
--with-mpfr-lib=$(pwd)/mpfr/src/.libs</userinput></screen>

15
chapter05/glibc.xml
View File

@ -74,11 +74,16 @@ esac</userinput></screen>
<para>Next, prepare Glibc for compilation:</para>
<screen><userinput remap="configure">../glibc-&glibc-version;/configure --prefix=/tools \
--host=$LFS_TGT --build=$(../glibc-&glibc-version;/scripts/config.guess) \
--disable-profile --enable-add-ons \
--enable-kernel=2.6.25 --with-headers=/tools/include \
libc_cv_forced_unwind=yes libc_cv_c_cleanup=yes</userinput></screen>
<screen><userinput remap="configure">../glibc-&glibc-version;/configure \
--prefix=/tools \
--host=$LFS_TGT \
--build=$(../glibc-&glibc-version;/scripts/config.guess) \
--disable-profile \
--enable-add-ons \
--enable-kernel=2.6.25 \
--with-headers=/tools/include \
libc_cv_forced_unwind=yes \
libc_cv_c_cleanup=yes</userinput></screen>
<variablelist>
<title>The meaning of the configure options:</title>

3
chapter05/grep.xml
View File

@ -45,8 +45,7 @@
<para>Prepare Grep for compilation:</para>
<screen><userinput remap="configure">./configure --prefix=/tools \
--disable-perl-regexp</userinput></screen>
<screen><userinput remap="configure">./configure --prefix=/tools --disable-perl-regexp</userinput></screen>
<variablelist>
<title>The meaning of the configure switches:</title>

8
chapter06/bash.xml
View File

@ -47,9 +47,11 @@
<para>Prepare Bash for compilation:</para>
<screen><userinput remap="configure">./configure --prefix=/usr --bindir=/bin \
--htmldir=/usr/share/doc/bash-&bash-version; --without-bash-malloc \
--with-installed-readline</userinput></screen>
<screen><userinput remap="configure">./configure --prefix=/usr \
--bindir=/bin \
--htmldir=/usr/share/doc/bash-&bash-version; \
--without-bash-malloc \
--with-installed-readline</userinput></screen>
<variablelist>
<title>The meaning of the configure options:</title>

4
chapter06/chroot.xml
View File

@ -16,7 +16,9 @@
realm that is, at the moment, populated with only the temporary tools:</para>
<screen><userinput>chroot "$LFS" /tools/bin/env -i \
HOME=/root TERM="$TERM" PS1='\u:\w\$ ' \
HOME=/root \
TERM="$TERM" \
PS1='\u:\w\$ ' \
PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin \
/tools/bin/bash --login +h</userinput></screen>

19
chapter06/e2fsprogs.xml
View File

@ -52,10 +52,15 @@ cd build</userinput></screen>
<para>Prepare E2fsprogs for compilation:</para>
<screen><userinput remap="configure">PKG_CONFIG=/tools/bin/true LDFLAGS="-lblkid -luuid" \
../configure --prefix=/usr --with-root-prefix="" \
--enable-elf-shlibs --disable-libblkid --disable-libuuid \
--disable-uuidd --disable-fsck</userinput></screen>
<screen><userinput remap="configure">PKG_CONFIG=/tools/bin/true \
LDFLAGS="-lblkid -luuid" \
../configure --prefix=/usr \
--with-root-prefix="" \
--enable-elf-shlibs \
--disable-libblkid \
--disable-libuuid \
--disable-uuidd \
--disable-fsck</userinput></screen>
<variablelist>
<title>The meaning of the configure options:</title>
@ -139,16 +144,14 @@ cd build</userinput></screen>
commands.</para>
<screen><userinput remap="install">gunzip -v /usr/share/info/libext2fs.info.gz
install-info --dir-file=/usr/share/info/dir \
/usr/share/info/libext2fs.info</userinput></screen>
install-info --dir-file=/usr/share/info/dir /usr/share/info/libext2fs.info</userinput></screen>
<para>If desired, create and install some additional documentation by
issuing the following commands:</para>
<screen><userinput remap="install">makeinfo -o doc/com_err.info ../lib/et/com_err.texinfo
install -v -m644 doc/com_err.info /usr/share/info
install-info --dir-file=/usr/share/info/dir \
/usr/share/info/com_err.info</userinput></screen>
install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.info</userinput></screen>
</sect2>
<sect2 id="contents-e2fsprogs" role="content">

5
chapter06/findutils.xml
View File

@ -45,8 +45,9 @@
<para>Prepare Findutils for compilation:</para>
<screen><userinput remap="configure">./configure --prefix=/usr --libexecdir=/usr/lib/findutils \
--localstatedir=/var/lib/locate</userinput></screen>
<screen><userinput remap="configure">./configure --prefix=/usr \
--libexecdir=/usr/lib/findutils \
--localstatedir=/var/lib/locate</userinput></screen>
<variablelist>
<title>The meaning of the configure options:</title>

3
chapter06/flex.xml
View File

@ -88,8 +88,7 @@ chmod -v 755 /usr/bin/lex</userinput></screen>
file:</para>
<screen><userinput remap="install">mkdir -v /usr/share/doc/flex-&flex-version;
cp -v doc/flex.pdf \
/usr/share/doc/flex-&flex-version;</userinput></screen>
cp -v doc/flex.pdf /usr/share/doc/flex-&flex-version;</userinput></screen>
</sect2>

3
chapter06/gawk.xml
View File

@ -59,8 +59,7 @@
<para>If desired, install the documentation:</para>
<screen><userinput remap="install">mkdir -v /usr/share/doc/gawk-&gawk-version;
cp -v doc/{awkforai.txt,*.{eps,pdf,jpg}} \
/usr/share/doc/gawk-&gawk-version;</userinput></screen>
cp -v doc/{awkforai.txt,*.{eps,pdf,jpg}} /usr/share/doc/gawk-&gawk-version;</userinput></screen>
</sect2>

18
chapter06/gcc.xml
View File

@ -54,8 +54,7 @@
consistent compiler builds:</para>
<screen><userinput remap="pre">case `uname -m` in
i?86) sed -i 's/^T_CFLAGS =$/&amp; -fomit-frame-pointer/' \
gcc/Makefile.in ;;
i?86) sed -i 's/^T_CFLAGS =$/&amp; -fomit-frame-pointer/' gcc/Makefile.in ;;
esac</userinput></screen>
<para>The <command>fixincludes</command> script is known to occasionally
@ -74,11 +73,16 @@ cd ../gcc-build</userinput></screen>
<para>Prepare GCC for compilation:</para>
<screen><userinput remap="configure">../gcc-&gcc-version;/configure --prefix=/usr \
--libexecdir=/usr/lib --enable-shared \
--enable-threads=posix --enable-__cxa_atexit \
--enable-clocale=gnu --enable-languages=c,c++ \
--disable-multilib --disable-bootstrap --with-system-zlib</userinput></screen>
<screen><userinput remap="configure">../gcc-&gcc-version;/configure --prefix=/usr \
--libexecdir=/usr/lib \
--enable-shared \
--enable-threads=posix \
--enable-__cxa_atexit \
--enable-clocale=gnu \
--enable-languages=c,c++ \
--disable-multilib \
--disable-bootstrap \
--with-system-zlib</userinput></screen>
<para>Note that for other languages, there are some prerequisites that
are not available. See the BLFS Book for instructions on how to

9
chapter06/glibc.xml
View File

@ -130,9 +130,12 @@ esac</userinput></screen>
<para>Prepare Glibc for compilation:</para>
<screen><userinput remap="configure">../glibc-&glibc-version;/configure --prefix=/usr \
--disable-profile --enable-add-ons \
--enable-kernel=2.6.25 --libexecdir=/usr/lib/glibc</userinput></screen>
<screen><userinput remap="configure">../glibc-&glibc-version;/configure \
--prefix=/usr \
--disable-profile \
--enable-add-ons \
--enable-kernel=2.6.25 \
--libexecdir=/usr/lib/glibc</userinput></screen>
<variablelist>
<title>The meaning of the new configure options:</title>

10
chapter06/grub.xml
View File

@ -42,11 +42,11 @@
<para>Prepare GRUB for compilation:</para>
<screen><userinput remap="configure">./configure --prefix=/usr \
--sysconfdir=/etc \
--disable-grub-emu-usb \
--disable-efiemu \
--disable-werror</userinput></screen>
<screen><userinput remap="configure">./configure --prefix=/usr \
--sysconfdir=/etc \
--disable-grub-emu-usb \
--disable-efiemu \
--disable-werror</userinput></screen>
<para>The --disable switches minimize what is built by disabling features
and testing programs not really needed for LFS.</para>

10
chapter06/inetutils.xml
View File

@ -40,9 +40,13 @@
<sect2 role="installation">
<title>Installation of Inetutils</title>
<screen><userinput remap="configure">./configure --prefix=/usr --libexecdir=/usr/sbin \
--localstatedir=/var --disable-ifconfig \
--disable-logger --disable-syslogd --disable-whois \
<screen><userinput remap="configure">./configure --prefix=/usr \
--libexecdir=/usr/sbin \
--localstatedir=/var \
--disable-ifconfig \
--disable-logger \
--disable-syslogd \
--disable-whois \
--disable-servers</userinput></screen>
<variablelist>

4
chapter06/iproute2.xml
View File

@ -87,7 +87,9 @@ rm man/man8/arpd.8</userinput></screen>
<para>Install the package:</para>
<screen><userinput remap="install">make DESTDIR= MANDIR=/usr/share/man \
<screen><userinput remap="install">
make DESTDIR= \
MANDIR=/usr/share/man \
DOCDIR=/usr/share/doc/iproute2-&iproute2-version; install</userinput></screen>
</sect2>

10
chapter06/kmod.xml
View File

@ -47,8 +47,12 @@
liblzma_LIBS="-L/lib -llzma" \
zlib_CFLAGS="-I/usr/include" \
zlib_LIBS="-L/lib -lz" \
./configure --prefix=/usr --bindir=/bin --libdir=/lib --sysconfdir=/etc \
--with-xz --with-zlib</userinput></screen>
./configure --prefix=/usr \
--bindir=/bin \
--libdir=/lib \
--sysconfdir=/etc \
--with-xz \
--with-zlib</userinput></screen>
<variablelist>
<title>The meaning of the configure options:</title>
@ -77,9 +81,11 @@ zlib_LIBS="-L/lib -lz" \
</para>
<screen><userinput remap="install">make pkgconfigdir=/usr/lib/pkgconfig install
for target in depmod insmod modinfo modprobe rmmod; do
ln -sv ../bin/kmod /sbin/$target
done
ln -sv kmod /bin/lsmod</userinput></screen>
</sect2>

5
chapter06/libpipeline.xml
View File

@ -43,8 +43,9 @@
<para>Prepare Libpipeline for compilation:</para>
<screen><userinput remap="configure">./configure CHECK_CFLAGS=-I/tools/include \
CHECK_LIBS="-L/tools/lib -lcheck" --prefix=/usr</userinput></screen>
<screen><userinput remap="configure">./configure CHECK_CFLAGS=-I/tools/include \
CHECK_LIBS="-L/tools/lib -lcheck" \
--prefix=/usr</userinput></screen>
<variablelist>
<title>The meaning of the configure options:</title>

18
chapter06/man-db.xml
View File

@ -43,13 +43,17 @@
<para>Prepare Man-DB for compilation:</para>
<screen><userinput remap="configure">PKG_CONFIG=/tools/bin/true \
libpipeline_CFLAGS='' \
libpipeline_LIBS='-lpipeline' \
./configure --prefix=/usr --libexecdir=/usr/lib \
--docdir=/usr/share/doc/man-db-&man-db-version; --sysconfdir=/etc \
--disable-setuid --with-browser=/usr/bin/lynx \
--with-vgrind=/usr/bin/vgrind --with-grap=/usr/bin/grap</userinput></screen>
<screen><userinput remap="configure">PKG_CONFIG=/tools/bin/true \
libpipeline_CFLAGS='' \
libpipeline_LIBS='-lpipeline' \
./configure --prefix=/usr \
--libexecdir=/usr/lib \
--docdir=/usr/share/doc/man-db-&man-db-version; \
--sysconfdir=/etc \
--disable-setuid \
--with-browser=/usr/bin/lynx \
--with-vgrind=/usr/bin/vgrind \
--with-grap=/usr/bin/grap</userinput></screen>
<variablelist>
<title>The meaning of the configure options:</title>

5
chapter06/mpfr.xml
View File

@ -47,8 +47,9 @@
<para>Prepare MPFR for compilation:</para>
<screen><userinput remap="configure">./configure --prefix=/usr --enable-thread-safe \
--docdir=/usr/share/doc/mpfr-&mpfr-version;</userinput></screen>
<screen><userinput remap="configure">./configure --prefix=/usr \
--enable-thread-safe \
--docdir=/usr/share/doc/mpfr-&mpfr-version;</userinput></screen>
<para>Compile the package:</para>

2
chapter06/perl.xml
View File

@ -66,7 +66,7 @@
this package is built. Alternatively, use the command exactly as below to
use the defaults that Perl auto-detects:</para>
<screen><userinput remap="configure">sh Configure -des -Dprefix=/usr \
<screen><userinput remap="configure">sh Configure -des -Dprefix=/usr \
-Dvendorprefix=/usr \
-Dman1dir=/usr/share/man/man1 \
-Dman3dir=/usr/share/man/man3 \

2
chapter06/psmisc.xml
View File

@ -58,7 +58,7 @@
<para>Finally, move the <command>killall</command> and <command>fuser</command>
programs to the location specified by the FHS:</para>
<screen><userinput remap="install">mv -v /usr/bin/fuser /bin
<screen><userinput remap="install">mv -v /usr/bin/fuser /bin
mv -v /usr/bin/killall /bin</userinput></screen>
</sect2>

3
chapter06/sysvinit.xml
View File

@ -52,8 +52,7 @@
<quote>Sending processes configured via /etc/inittab the TERM signal</quote>
instead:</para>
<screen><userinput remap="pre">sed -i 's@Sending processes@&amp; configured via /etc/inittab@g' \
src/init.c</userinput></screen>
<screen><userinput remap="pre">sed -i 's@Sending processes@&amp; configured via /etc/inittab@g' src/init.c</userinput></screen>
<para>Maintained versions of the <command>wall</command> and
<command>mountpoint</command> programs were

6
chapter06/tar.xml
View File

@ -42,8 +42,10 @@
<para>Prepare Tar for compilation:</para>
<screen><userinput remap="configure">FORCE_UNSAFE_CONFIGURE=1 ./configure --prefix=/usr \
--bindir=/bin --libexecdir=/usr/sbin</userinput></screen>
<screen><userinput remap="configure">FORCE_UNSAFE_CONFIGURE=1 \
./configure --prefix=/usr \
--bindir=/bin \
--libexecdir=/usr/sbin</userinput></screen>
<variablelist>
<title>The meaning of the configure options:</title>

3
chapter06/util-linux.xml
View File

@ -49,8 +49,7 @@
<command>hwclock</command> program FHS-compliant, run the
following:</para>
<screen><userinput remap="pre">sed -e 's@etc/adjtime@var/lib/hwclock/adjtime@g' \
-i $(grep -rl '/etc/adjtime' .)
<screen><userinput remap="pre">sed -e 's@etc/adjtime@var/lib/hwclock/adjtime@g' -i $(grep -rl '/etc/adjtime' .)
mkdir -pv /var/lib/hwclock</userinput></screen>
</sect2>