From 17476c5481ff8ebced096511eb66134c68f6f042 Mon Sep 17 00:00:00 2001 From: Alex Gronenwoud Date: Mon, 26 Jan 2004 22:23:41 +0000 Subject: Removing some excess white space. git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@3186 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- chapter05/binutils-pass2.xml | 2 +- chapter05/chapter05.xml | 10 +++++----- chapter05/gcc-pass1.xml | 2 +- chapter05/gcc-pass2.xml | 10 +++++----- chapter05/grep.xml | 6 +++--- chapter05/utillinux.xml | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) (limited to 'chapter05') diff --git a/chapter05/binutils-pass2.xml b/chapter05/binutils-pass2.xml index 5b521f033..de0280e47 100644 --- a/chapter05/binutils-pass2.xml +++ b/chapter05/binutils-pass2.xml @@ -54,7 +54,7 @@ should be easy to spot. The output shown will contain something like:
make[1]: *** [check-binutils] Error 2
-And install the package: +And install the package: make install diff --git a/chapter05/chapter05.xml b/chapter05/chapter05.xml index 235dddce6..b49c41468 100644 --- a/chapter05/chapter05.xml +++ b/chapter05/chapter05.xml @@ -308,7 +308,7 @@ the LFS partition). When logged in as root, making a single mistake can damage or even wreck your system. Therefore we recommend that you build the packages in this chapter as an unprivileged user. You could -of course use your own user name, but to make it easier to set up a clean +of course use your own user name, but to make it easier to set up a clean work environment we'll create a new user lfs and use this one during the installation process. As root, issue the following commands to add the new user: @@ -382,7 +382,7 @@ export LFS LC_ALL PATH feature: bash uses a hash table to remember the full pathnames of executable files to avoid searching the PATH time and time again to find the same executable. However, we'd like the new tools to be -used as soon as they are installed. By switching off the hash function, our +used as soon as they are installed. By switching off the hash function, our "interactive" commands (make, patch, sed, cp and so forth) will always use @@ -400,7 +400,7 @@ making their messages follow the conventions of a specified country. If your host system uses a version of Glibc older than 2.2.4, having LC_ALL set to something other than "POSIX" or "C" during this chapter may cause trouble if you exit the chroot environment and wish to return later. -By setting LC_ALL to "POSIX" (or "C", the two are equivalent) we ensure that +By setting LC_ALL to "POSIX" (or "C", the two are equivalent) we ensure that everything will work as expected in the chroot environment. We prepend /tools/bin to the standard PATH so @@ -454,7 +454,7 @@ Binutils build and source directories. to the new dynamic linker. A simple sed will accomplish this: - + SPECFILE=/tools/lib/gcc-lib/*/*/specs && sed -e 's@ /lib/ld-linux.so.2@ /tools/lib/ld-linux.so.2@g' \     $SPECFILE > tempspecfile && @@ -476,7 +476,7 @@ name of your platform's dynamic linker in the above commands. Refer back to Lastly, there is a possibility that some include files from the host system have found their way into GCC's private include dir. This can happen because of GCC's "fixincludes" process which runs as part of the GCC build. -We'll explain more about this further on in this chapter. For now, run the +We'll explain more about this further on in this chapter. For now, run the following commands to eliminate this possibility: rm -f /tools/lib/gcc-lib/*/*/include/{pthread.h,bits/sigthread.h} diff --git a/chapter05/gcc-pass1.xml b/chapter05/gcc-pass1.xml index a0d4af5c7..525da689f 100644 --- a/chapter05/gcc-pass1.xml +++ b/chapter05/gcc-pass1.xml @@ -40,7 +40,7 @@ cd ../gcc-build The meaning of the configure options: ---with-local-prefix=/tools: The +--with-local-prefix=/tools: The purpose of this switch is to remove /usr/local/include from gcc's include search path. This is not absolutely essential; however, we want to try to minimize the influence of the host diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml index 762ce0d17..314f88019 100644 --- a/chapter05/gcc-pass2.xml +++ b/chapter05/gcc-pass2.xml @@ -44,12 +44,12 @@ same working directory. They will all unfold into a single patch -Np1 -i ../&gcc-nofixincludes-patch; patch -Np1 -i ../&gcc-specs-patch; -The first patch disables the GCC "fixincludes" script. We mentioned this +The first patch disables the GCC "fixincludes" script. We mentioned this briefly earlier, but a slightly more in-depth explanation of the fixincludes -process is warranted here. Under normal circumstances, the GCC fixincludes -script scans your system for header files that need to be fixed. It might find +process is warranted here. Under normal circumstances, the GCC fixincludes +script scans your system for header files that need to be fixed. It might find that some Glibc header files on your host system need to be fixed, fix them and -put them in the GCC private include directory. Then, later on in +put them in the GCC private include directory. Then, later on in , after we've installed the newer Glibc, this private include directory would be searched before the system include directory, resulting in GCC finding the fixed headers from the host system, @@ -159,7 +159,7 @@ usually aware of them but haven't yet gotten around to fixing them. In short, unless your results are vastly different from those at the above URL, it is safe to continue on. -And finally install the package: +And finally install the package: make install diff --git a/chapter05/grep.xml b/chapter05/grep.xml index 931d09671..cdeff1166 100644 --- a/chapter05/grep.xml +++ b/chapter05/grep.xml @@ -23,11 +23,11 @@ Estimated required disk space: &grep-compsize-tools; --disable-perl-regexp: This makes sure that grep does not get linked against a PCRE library -that may be present on the host, but would not be available once we enter the +that may be present on the host and would not be available once we enter the chroot environment. --with-included-regex: This ensures that -Grep uses its internal regular expression code. Without it, it will use -the code from Glibc, which is known to be slightly buggy. +Grep uses its internal regular expression code. Without this switch, Grep will +use the code from Glibc, which is known to be slightly buggy. Compile the programs: diff --git a/chapter05/utillinux.xml b/chapter05/utillinux.xml index 845bc53db..302255758 100644 --- a/chapter05/utillinux.xml +++ b/chapter05/utillinux.xml @@ -14,7 +14,7 @@ Estimated required disk space: &util-linux-compsize-tools; Installation of Util-linux Util-linux doesn't use the freshly installed headers and libraries from -the /tools directory. This is fixed by altering the +the /tools directory. This is fixed by altering the configure script: cp configure configure.backup -- cgit v1.2.3-54-g00ecf