diff options
author | Archaic <archaic@linuxfromscratch.org> | 2005-06-29 16:24:16 +0000 |
---|---|---|
committer | Archaic <archaic@linuxfromscratch.org> | 2005-06-29 16:24:16 +0000 |
commit | 663ecfcc5f04e7c2860b83ef89e49f5e8b68bbbe (patch) | |
tree | 7c789513e8b75ee906795c4a06600e2e4284638f /chapter05 | |
parent | 2ec0d203c3af587beb98406888dca6f6f5283180 (diff) |
Several minor wording changes (chapters 1 - 5).
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@6232 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Diffstat (limited to 'chapter05')
-rw-r--r-- | chapter05/expect.xml | 7 | ||||
-rw-r--r-- | chapter05/gawk.xml | 2 | ||||
-rw-r--r-- | chapter05/gettext.xml | 7 | ||||
-rw-r--r-- | chapter05/glibc.xml | 11 | ||||
-rw-r--r-- | chapter05/grep.xml | 7 | ||||
-rw-r--r-- | chapter05/ncurses.xml | 7 | ||||
-rw-r--r-- | chapter05/perl.xml | 5 | ||||
-rw-r--r-- | chapter05/tcl.xml | 2 | ||||
-rw-r--r-- | chapter05/toolchaintechnotes.xml | 18 | ||||
-rw-r--r-- | chapter05/util-linux.xml | 10 |
10 files changed, 35 insertions, 41 deletions
diff --git a/chapter05/expect.xml b/chapter05/expect.xml index 288747467..bda9a531a 100644 --- a/chapter05/expect.xml +++ b/chapter05/expect.xml @@ -55,15 +55,16 @@ one on the host system.</para></listitem> <term><parameter>--with-tclinclude=$TCLPATH</parameter></term> <listitem><para>This explicitly tells Expect where to find Tcl's source directory and internal headers. Using this option avoids conditions -where <command>configure</command> fails because it hasn't automatically -discovered the location of the Tcl source directory.</para></listitem> +where <command>configure</command> fails because it cannot automatically +discover the location of the Tcl source directory.</para></listitem> </varlistentry> <varlistentry> <term><parameter>--with-x=no</parameter></term> <listitem><para>This tells the configure script not to search for Tk (the Tcl GUI component) or the X Window System libraries, both of -which may reside on the host system.</para></listitem> +which may reside on the host system but will not exist in the temporary +environment.</para></listitem> </varlistentry> </variablelist> diff --git a/chapter05/gawk.xml b/chapter05/gawk.xml index 5485b1f78..675d5e077 100644 --- a/chapter05/gawk.xml +++ b/chapter05/gawk.xml @@ -37,7 +37,7 @@ <screen><userinput>make</userinput></screen> -<para>To test the results (not necessary), issue: <userinput>make +<para>To test the results, issue: <userinput>make check</userinput>.</para> <para>Install the package:</para> diff --git a/chapter05/gettext.xml b/chapter05/gettext.xml index cbe7b5f26..9d4823060 100644 --- a/chapter05/gettext.xml +++ b/chapter05/gettext.xml @@ -47,10 +47,9 @@ exclude it to save time and space.</para></listitem> <varlistentry> <term><parameter>--without-csharp</parameter></term> -<listitem><para>This tells Gettext not to use a C# compiler, even if a -C# compiler is installed on the host. This needs to be done because -once we enter the chroot environment, C# will no longer be -available.</para></listitem> +<listitem><para>This ensures that Gettext does not build support for the C# +compiler which may be present on the host but will not be available once we +enter the chroot environment.</para></listitem> </varlistentry> </variablelist> diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml index 053b19c24..2835395ea 100644 --- a/chapter05/glibc.xml +++ b/chapter05/glibc.xml @@ -104,16 +104,13 @@ installed to the tools directory, so that it knows exactly what features the kernel has and can optimize itself accordingly.</para></listitem> </varlistentry> -<!-- Edit Me --> <varlistentry> <term><parameter>--without-selinux</parameter></term> -<listitem><para>When building from hosts using SELinux functionality -(i.e. Fedora Core 3), Glibc will try to integrate this functionality into -itself, but will fail, because we do not have this functionality in the LFS -tools environment. This option will disable this, allowing Glibc to build -correctly, but will not otherwise affect the build.</para></listitem> +<listitem><para>When building from hosts that include SELinux functionality +(e.g. Fedora Core 3), Glibc will build with support for SELinux. As the LFS +tools environment does not contain support for SELinux, a Glibc compiled with +such support will fail to operate correctly.</para></listitem> </varlistentry> -<!-- --> </variablelist> <para>During this stage the following warning might appear:</para> diff --git a/chapter05/grep.xml b/chapter05/grep.xml index 6c4b9b01c..413133f63 100644 --- a/chapter05/grep.xml +++ b/chapter05/grep.xml @@ -39,10 +39,9 @@ <variablelist> <varlistentry> <term><parameter>--disable-perl-regexp</parameter></term> -<listitem><para>This makes sure that the <command>grep</command> -program does not get linked against a Perl Compatible Regular -Expression (PCRE) library that may be present on the host and would -not be available once we enter the chroot +<listitem><para>This ensures that the <command>grep</command> program does not +get linked against a Perl Compatible Regular Expression (PCRE) library that may +be present on the host but will not be available once we enter the chroot environment.</para></listitem> </varlistentry> </variablelist> diff --git a/chapter05/ncurses.xml b/chapter05/ncurses.xml index 01ecc960c..a30028ff5 100644 --- a/chapter05/ncurses.xml +++ b/chapter05/ncurses.xml @@ -39,10 +39,9 @@ <variablelist> <varlistentry> <term><parameter>--without-ada</parameter></term> -<listitem><para>This tells Ncurses not to build its Ada bindings, even -if an Ada compiler is installed on the host. This needs to be done -because once we enter the chroot environment, Ada will no longer be -available.</para></listitem> +<listitem><para>This ensures that Ncurses does not build support for the ada +compiler which may be present on the host but will not be available once we +enter the chroot environment.</para></listitem> </varlistentry> <varlistentry> diff --git a/chapter05/perl.xml b/chapter05/perl.xml index ac18ab5bd..7bd454779 100644 --- a/chapter05/perl.xml +++ b/chapter05/perl.xml @@ -50,7 +50,8 @@ the next chapter.</para></listitem> </varlistentry> </variablelist> -<para>Compile only the required tools:</para> +<para>Only a few of the utilities contained in this package need to be +built:</para> <screen><userinput>make perl utilities</userinput></screen> @@ -60,7 +61,7 @@ run it at this point. Only part of Perl was built and running built as well, which is unnecessary at this point. The test suite can be run in the next chapter if desired.</para> -<para>Copy these tools and their libraries:</para> +<para>Install these tools and their libraries:</para> <screen><userinput>cp perl pod/pod2man /tools/bin mkdir -p /tools/lib/perl5/&perl-version; diff --git a/chapter05/tcl.xml b/chapter05/tcl.xml index 11b2ff753..da54b25ae 100644 --- a/chapter05/tcl.xml +++ b/chapter05/tcl.xml @@ -57,7 +57,7 @@ considered critical. The <parameter>TZ=UTC</parameter> parameter sets the time zone to Coordinated Universal Time (UTC), also known as Greenwich Mean Time (GMT), but only for the duration of the test suite run. This ensures that the clock tests are exercised correctly. -Details on the <envar>TZ</envar> environment variable is provided in +Details on the <envar>TZ</envar> environment variable are provided in <xref linkend="chapter-bootscripts"/>.</para> <para>Install the package:</para> diff --git a/chapter05/toolchaintechnotes.xml b/chapter05/toolchaintechnotes.xml index 5b2522458..6e4d54afb 100644 --- a/chapter05/toolchaintechnotes.xml +++ b/chapter05/toolchaintechnotes.xml @@ -13,16 +13,14 @@ immediately understand everything in this section. Most of this information will be clearer after performing an actual build. This section can be referred back to at any time during the process.</para> -<para>The overall goal of <xref linkend="chapter-temporary-tools"/> is -to provide a temporary environment that can be chrooted into and from -which can be produced a clean, trouble-free build of the target LFS -system in <xref linkend="chapter-building-system"/>. Along the way, we -separate from the host system as much as possible, and in doing so, -build a self-contained and self-hosted toolchain. It should be noted -that the build process has been designed to minimize the risks for new -readers and provide maximum educational value at the same time. In -other words, more advanced techniques could be used to build the -system.</para> +<para>The overall goal of <xref linkend="chapter-temporary-tools"/> is to +provide a temporary environment that can be chrooted into and from which can be +produced a clean, trouble-free build of the target LFS system in <xref +linkend="chapter-building-system"/>. Along the way, we separate the new system +from the host system as much as possible, and in doing so, build a +self-contained and self-hosted toolchain. It should be noted that the build +process has been designed to minimize the risks for new readers and provide +maximum educational value at the same time.</para> <important> <para>Before continuing, be aware of the name of the working platform, diff --git a/chapter05/util-linux.xml b/chapter05/util-linux.xml index 653f19242..a869233a9 100644 --- a/chapter05/util-linux.xml +++ b/chapter05/util-linux.xml @@ -29,9 +29,9 @@ <sect2 role="installation"> <title>Installation of Util-linux</title> -<para>Util-linux does not use the freshly installed headers and -libraries from the <filename class="directory">/tools</filename> -directory. This is fixed by altering the configure script:</para> +<para>Util-linux does not use the freshly installed headers and libraries from +the <filename class="directory">/tools</filename> directory by default. This is +fixed by altering the configure script:</para> <screen><userinput>sed -i 's@/usr/include@/tools/include@g' configure</userinput></screen> @@ -43,8 +43,8 @@ directory. This is fixed by altering the configure script:</para> <screen><userinput>make -C lib</userinput></screen> -<para>Since only a couple of the utilities contained in this package -are needed, build only those:</para> +<para>Only a few of the utilities contained in this package need to be +built:</para> <screen><userinput>make -C mount mount umount make -C text-utils more</userinput></screen> |