diff options
author | Timothy Bauscher <timothy@linuxfromscratch.org> | 2002-09-20 21:11:28 +0000 |
---|---|---|
committer | Timothy Bauscher <timothy@linuxfromscratch.org> | 2002-09-20 21:11:28 +0000 |
commit | 26e62aa22dcb6ce6b63a5a21b44825ff19b2405e (patch) | |
tree | 019a059bdc24940a10f4571c4d6cf3cd88cfab4c /chapter05 | |
parent | eb7df24002f43d7b8ab45a2868a9dfe345a97551 (diff) |
Removed --enable-threads=posix from static gcc compilation. Fixed changelog and a number of typos.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@2121 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Diffstat (limited to 'chapter05')
-rw-r--r-- | chapter05/bash-exp.xml | 2 | ||||
-rw-r--r-- | chapter05/bash-inst.xml | 2 | ||||
-rw-r--r-- | chapter05/creatingstaticdir.xml | 2 | ||||
-rw-r--r-- | chapter05/fileutils-exp.xml | 2 | ||||
-rw-r--r-- | chapter05/gcc-exp.xml | 5 | ||||
-rw-r--r-- | chapter05/gcc-inst.xml | 2 | ||||
-rw-r--r-- | chapter05/installasuser.xml | 10 | ||||
-rw-r--r-- | chapter05/shellutils-inst.xml | 4 | ||||
-rw-r--r-- | chapter05/whystatic.xml | 4 |
9 files changed, 15 insertions, 18 deletions
diff --git a/chapter05/bash-exp.xml b/chapter05/bash-exp.xml index 244e16f95..c6ea2db4e 100644 --- a/chapter05/bash-exp.xml +++ b/chapter05/bash-exp.xml @@ -14,7 +14,7 @@ library which is becoming obsolete.</para> <para>It is not strictly necessary for the static bash to be linked against libncurses (it can link against a static termcap for the time -being just fine because we will reinstall Bash in chapter 6 anyways, +being just fine because we will reinstall Bash in Chapter 6 anyways, where we will use libncurses), but it's a good test to make sure that the Ncurses package has been installed properly. If not, you will get in trouble later on in this chapter when you install the Texinfo package. diff --git a/chapter05/bash-inst.xml b/chapter05/bash-inst.xml index bfd893b88..97525bd11 100644 --- a/chapter05/bash-inst.xml +++ b/chapter05/bash-inst.xml @@ -42,7 +42,7 @@ make: [install] Error 2 (ignored)</screen></blockquote> <para>then that means that you are probably using Debian, and that you have an old version of the texinfo package. This error is not severe by any means: the info pages will be installed when we recompile bash dynamically in -chapter 6, so you can ignore it.</para> +Chapter 6, so you can ignore it.</para> </sect2> diff --git a/chapter05/creatingstaticdir.xml b/chapter05/creatingstaticdir.xml index 480b0d86e..9e83b9952 100644 --- a/chapter05/creatingstaticdir.xml +++ b/chapter05/creatingstaticdir.xml @@ -11,7 +11,7 @@ command to create the directory:</para> <para><screen><userinput>mkdir $LFS/static</userinput></screen></para> -<para>You may want to move the packages you downloaded in chapter 3 to this +<para>You may want to move the packages you downloaded in Chapter 3 to this <filename class="directory">$LFS/static</filename> directory, perhaps create a subdirectory <filename class="directory">$LFS/static/src</filename> to keep them in.</para> diff --git a/chapter05/fileutils-exp.xml b/chapter05/fileutils-exp.xml index 65d19c2c1..ec4647069 100644 --- a/chapter05/fileutils-exp.xml +++ b/chapter05/fileutils-exp.xml @@ -4,7 +4,7 @@ <para><userinput>patch -Np1 -i ../fileutils-&fileutils-version;.patch:</userinput> This is used to fix a problem with building fileutils statically on glibc 2.2.3 systems. If this isn't done, then there is the possibility of all of the fileutils programs causing segmentation faults once chroot is -entered in chapter 6.</para> +entered in Chapter 6.</para> </sect2> diff --git a/chapter05/gcc-exp.xml b/chapter05/gcc-exp.xml index 91d47bdd6..dc2e67bf2 100644 --- a/chapter05/gcc-exp.xml +++ b/chapter05/gcc-exp.xml @@ -12,13 +12,10 @@ prefix during ./configure. We pass the real install prefix during the make install command later.</para> <para><userinput>--enable-languages=c:</userinput> This builds the C -compiler. The C++ compiler will be built in chapter 6, when we rebuild +compiler. The C++ compiler will be built in Chapter 6, when we rebuild GCC. Other compilers are available as well. If they are needed, the --enable-languages parameter may be omitted.</para> -<para><userinput>--enable-threads=posix:</userinput> This enables C++ -exception handling for multithreaded code.</para> - <para><userinput>echo "#define HAVE_GAS_HIDDEN 1":</userinput> This defines the .hidden assembler directive so that we don't build a faulty Glibc later on.</para> diff --git a/chapter05/gcc-inst.xml b/chapter05/gcc-inst.xml index c02291141..b31761aea 100644 --- a/chapter05/gcc-inst.xml +++ b/chapter05/gcc-inst.xml @@ -18,7 +18,7 @@ been warned.</para> mkdir ../gcc-build && cd ../gcc-build && ../gcc-&gcc-version;/configure --prefix=/static --enable-languages=c \ - --disable-nls --disable-shared --enable-threads=posix && + --disable-nls --disable-shared && echo "#define HAVE_GAS_HIDDEN 1" >> gcc/auto-host.h && make BOOT_LDFLAGS=-static bootstrap && make prefix=$LFS/static install && diff --git a/chapter05/installasuser.xml b/chapter05/installasuser.xml index 564667598..16372861a 100644 --- a/chapter05/installasuser.xml +++ b/chapter05/installasuser.xml @@ -2,13 +2,13 @@ <title>Install all software as an unprivileged user</title> <?dbhtml filename="installasuser.html" dir="chapter05"?> -<para>When you are logged in as root during chapter 5, it is possible +<para>When you are logged in as root during Chapter 5, it is possible that some files of your host system will be overwritten by the ones -you'll build in chapter 5. There can be all kinds of reasons for this +you'll build in Chapter 5. There can be all kinds of reasons for this to happen, for example because the $LFS environment variable is not set. Overwriting some files from your host system will most likely cause all kinds of problems, so it's a good idea to be logged in as -an unprivileged user during chapter 5. To make sure the environment +an unprivileged user during Chapter 5. To make sure the environment is as clean as possible, we'll create a new user "lfs" that can be used while building the static installation. Issuing the following commands as root will create a new user "lfs":</para> @@ -46,8 +46,8 @@ internationalization.</para> <para>When your host distribution uses a glibc version older than 2.2.4, having $LC_ALL set to something else than "C" or "POSIX" while working -through chapter 5 may cause trouble when you exit the chroot environment -of chapter 6 and try to return to it. By setting this to "POSIX" ("C" +through Chapter 5 may cause trouble when you exit the chroot environment +of Chapter 6 and try to return to it. By setting this to "POSIX" ("C" is an alias for "POSIX") we ensure that everything will work as expected in the chroot environment.</para> diff --git a/chapter05/shellutils-inst.xml b/chapter05/shellutils-inst.xml index 50cdd698a..9c31de806 100644 --- a/chapter05/shellutils-inst.xml +++ b/chapter05/shellutils-inst.xml @@ -24,8 +24,8 @@ NOTE: to install su, run 'make install-root' as root</screen></blockquote> <para>You can safely ignore that warning. You need to be logged in as root in order to install su the way Sh-utils wants to install it, which is being -suid root. Because we don't need su during chapter 6, and su will be properly -installed when we re-install Sh-utils in chapter 6, you can just +suid root. Because we don't need su during Chapter 6, and su will be properly +installed when we re-install Sh-utils in Chapter 6, you can just pretend you didn't see it.</para> </sect2> diff --git a/chapter05/whystatic.xml b/chapter05/whystatic.xml index 43789da1a..e0fc14a6b 100644 --- a/chapter05/whystatic.xml +++ b/chapter05/whystatic.xml @@ -46,9 +46,9 @@ you need to make sure that the libraries are statically linked when you build them, hence the <userinput>--enable-static-link</userinput>, <userinput>--disable-shared</userinput>, and <userinput>-static</userinput> flags used -through chapter 5. Once in chapter 6, the first thing we do is build the +through Chapter 5. Once in Chapter 6, the first thing we do is build the main set of system libraries, glibc. Once this is made we start rebuilding -all the programs we just did in chapter 5, but this time dynamically linked, +all the programs we just did in Chapter 5, but this time dynamically linked, so that we can take advantage of the space saving opportunities.</para> <para>And there you have it, that's why you need to use those weird |