aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerard Beekmans <gerard@linuxfromscratch.org>2001-01-27 01:16:17 +0000
committerGerard Beekmans <gerard@linuxfromscratch.org>2001-01-27 01:16:17 +0000
commit81797d0acbeaf9fb70542aad70c1959e7baf5c16 (patch)
tree1890b80df730f58d8b5f6c2acc4ea57b923a922a
parenta35e5d44499e3a1bdf44dbafc2396321534d775a (diff)
Removed the installation of a "local gcc"
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@43 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--chapter05/gcc-local-exp.sgml31
-rw-r--r--chapter05/gcc-local-inst.sgml55
-rw-r--r--chapter05/gcc-local.sgml9
-rw-r--r--chapter05/glibc-inst.sgml62
4 files changed, 9 insertions, 148 deletions
diff --git a/chapter05/gcc-local-exp.sgml b/chapter05/gcc-local-exp.sgml
deleted file mode 100644
index 0de2e3737..000000000
--- a/chapter05/gcc-local-exp.sgml
+++ /dev/null
@@ -1,31 +0,0 @@
-<sect2>
-<title>Command explanations</title>
-
-<para>
-<userinput>--with-local-prefix:</userinput> GCC installs a number of
-files in /usr/local even when --prefix is set to something else. We
-don't want that to happen in this case so that's why we use the
---with-local-prefix option to change that path.
-</para>
-
-<para>
-<userinput>--with-gxx-include-dir:</userinput> GCC installs the C++
-header files in /usr/include/g++ by default. Again, in this case we
-don't want that to happen, we want this GCC version to be installed
-completely under /usr/local/gcc2952.
-</para>
-
-<para>
-<userinput>make bootstrap:</userinput> Compile GCC by bootstrapping it.
-Here that means the compiler will be built three times in total. First
-it is compiled with your system's default compiler (which will usually
-be a gcc or egcs compiler). This is stage 1 compiler. Then GCC will re-compile
-itself but instead of using your system's compiler it will use itself to
-compile itself again. This is the stage 2 compiler. Then it will compile
-itself a second time with the stage 2 compiler and compares the second
-and the third build to see if they are identical. If so, the
-compilation was a success.
-</para>
-
-</sect2>
-
diff --git a/chapter05/gcc-local-inst.sgml b/chapter05/gcc-local-inst.sgml
deleted file mode 100644
index 983e0ebd4..000000000
--- a/chapter05/gcc-local-inst.sgml
+++ /dev/null
@@ -1,55 +0,0 @@
-<sect2>
-<title>Installation of GCC on the normal system if necessary</title>
-
-<para>
-In order to compile Glibc-2.1.3 later on you need to have gcc-2.95.2.1
-installed. Although any GCC version above 2.8 would do, 2.95.2.1 is the
-highly recommended version to use. egcs-2.91.x is also known to work. If you
-don't have gcc-2.95.x or egcs-2.91.x you need to install gcc-2.95.2.1 on
-your normal sytem before you can compile Glibc later in this chapter.
-</para>
-
-<para>
-To find out which compiler version your systems has, run the
-following command:
-</para>
-
-<blockquote><literallayout>
-
- <userinput>gcc --version</userinput>
-
-</literallayout></blockquote>
-
-<para>
-If you normal Linux system does not have gcc-2.95.x or egcs-2.91.x
-installed you need to install it now. We won't replace the current
-compiler on your system, but instead we will install gcc in a separate
-directory (/usr/local/gcc29521). This way no binaries or header files will be
-replaced.
-</para>
-
-<para>
-After you unpacked the gcc-2.95.2.1 archive don't enter the newly created
-gcc-2.95.2.1 directory but stay in the $LFS/usr/src directory. Install GCC by
-running the following commands:
-</para>
-
-<blockquote><literallayout>
-
- <userinput>mkdir $LFS/usr/src/gcc-build &amp;&amp;</userinput>
- <userinput>cd $LFS/usr/src/gcc-build &amp;&amp;</userinput>
- <userinput>../gcc-2.95.2.1/configure \</userinput>
- <userinput>&nbsp;&nbsp;&nbsp;--prefix=/usr/local/gcc29521 \</userinput>
- <userinput>&nbsp;&nbsp;&nbsp;--with-local-prefix=/usr/local/gcc29521
- \</userinput>
- <userinput>&nbsp;&nbsp;
- --with-gxx-include-dir=/usr/local/gcc29521/include/g++ \</userinput>
- <userinput>&nbsp;&nbsp;&nbsp;--enable-shared --enable-languages=c,c++
- &amp;&amp;</userinput>
- <userinput>make bootstrap &amp;&amp;</userinput>
- <userinput>make install</userinput>
-
-</literallayout></blockquote>
-
-</sect2>
-
diff --git a/chapter05/gcc-local.sgml b/chapter05/gcc-local.sgml
deleted file mode 100644
index 91b02f55a..000000000
--- a/chapter05/gcc-local.sgml
+++ /dev/null
@@ -1,9 +0,0 @@
-<sect1 id="ch05-gcclocal">
-<title>Installing GCC on the normal system if necessary</title>
-
-&c5-pp-gcc-local-inst;
-&c5-pp-gcc-local-exp;
-&aa-gcc-desc;
-
-</sect1>
-
diff --git a/chapter05/glibc-inst.sgml b/chapter05/glibc-inst.sgml
index bf50f9e89..e261844d7 100644
--- a/chapter05/glibc-inst.sgml
+++ b/chapter05/glibc-inst.sgml
@@ -3,7 +3,7 @@
<para>
Unpack the glibc-crypt and glibc-linuxthreads in the glibc-2.1.3
-directory, not in $LFS/usr/src. Don't enter the created directories. Just
+directory, not in /usr/src. Don't enter the created directories. Just
unpack them and leave it with that.
</para>
@@ -18,8 +18,8 @@ with:
<blockquote><literallayout>
- <userinput>mkdir $LFS/usr/src/glibc-build &amp;&amp;</userinput>
- <userinput>cd $LFS/usr/src/glibc-build</userinput>
+ <userinput>mkdir /usr/src/glibc-build &amp;&amp;</userinput>
+ <userinput>cd /usr/src/glibc-build</userinput>
</literallayout></blockquote>
@@ -42,34 +42,15 @@ sysconfdir=/etc
</literallayout>
<para>
-Before we actually install Glibc you need to unpack the Glibc patch
-file.
-</para>
-
-<para>
-Please note that the configure script of Glibc may complain about
-certain files in the /usr/include directory being too old and will be
-replaced, or that some symlink is not supposed to be there anymore (like
-the /usr/include/scsi symlink that's present on older Linux systems). If
-it asks you to move a symlink like scsi out of the way, please do so. If
-it says it will replace old files by the newer Glibc files you can
-ignore that. Glibc does not know that it will end up on $LFS when the
-configure script is run.
-</para>
-
-<para>
-If your system had already a suitable GCC version installed, change to the
+Change to the
<filename class="directory">$LFS/usr/src/glibc-build</filename>
-directory and install Glibc by running the following
-commands:
+directory and install Glibc by running the following commands:
</para>
<blockquote><literallayout>
- <userinput>cd ../glibc-2.1.3 &amp;&amp;</userinput>
- <userinput>patch -Np1 -i ../glibc-2.1.3.patch &amp;&amp;</userinput>
- <userinput>cd $LFS/usr/src/glibc-build &amp;&amp;</userinput>
- <userinput>../glibc-2.1.3/configure \</userinput>
+ <userinput>cd /usr/src/glibc-build &amp;&amp;</userinput>
+ <userinput>../glibc-2.2.1/configure \</userinput>
<userinput>&nbsp;&nbsp;&nbsp;--prefix=/usr --enable-add-ons
\</userinput>
<userinput>&nbsp;&nbsp;&nbsp;--with-headers=$LFS/usr/include
@@ -77,33 +58,8 @@ commands:
<userinput>&nbsp;&nbsp;&nbsp;--libexecdir=/usr/bin &amp;&amp;
</userinput>
<userinput>make &amp;&amp;</userinput>
- <userinput>make install_root=$LFS install &amp;&amp;</userinput>
- <userinput>make install_root=$LFS localedata/install-locales</userinput>
-
-</literallayout></blockquote>
-
-<para>
-If your system didn't have a suitable GCC version installed, change to the
-<filename class="directory">$LFS/usr/src/glibc-build</filename>
-directory and install Glibc using the gcc-2.95.2.1 you just installed by
-running the following commands:
-</para>
-
-<blockquote><literallayout>
-
- <userinput>cd ../glibc-2.1.3 &amp;&amp;</userinput>
- <userinput>patch -Np1 -i ../glibc-2.1.3.patch &amp;&amp;</userinput>
- <userinput>cd $LFS/usr/src/glibc-build &amp;&amp;</userinput>
- <userinput>CC=/usr/local/gcc2952/bin/gcc \</userinput>
- <userinput>&nbsp;&nbsp;&nbsp;../glibc-2.1.3/configure --prefix=/usr
- --enable-add-ons \</userinput>
- <userinput>&nbsp;&nbsp;&nbsp;--with-headers=$LFS/usr/include \
- </userinput>
- <userinput>&nbsp;&nbsp;&nbsp;--libexecdir=/usr/bin &amp;&amp;
- </userinput>
- <userinput>make &amp;&amp;</userinput>
- <userinput>make install_root=$LFS install &amp;&amp;</userinput>
- <userinput>make install_root=$LFS localedata/install-locales</userinput>
+ <userinput>make install &amp;&amp;</userinput>
+ <userinput>make localedata/install-locales</userinput>
</literallayout></blockquote>