aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chapter06/chapter06.xml1
-rw-r--r--chapter06/glibc-pass2-inst.xml71
-rw-r--r--chapter06/glibc-pass2.xml13
-rw-r--r--entities/glibc.ent2
4 files changed, 0 insertions, 87 deletions
diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml
index f1963a4e9..b92e9a9de 100644
--- a/chapter06/chapter06.xml
+++ b/chapter06/chapter06.xml
@@ -66,7 +66,6 @@
&c6-dejagnu;
&c6-gcc-2953;
&c6-kernel-manpages;
-&c6-glibc-pass2;
&c6-revisedchroot;
&c6-bootscripts;
&c6-configure;
diff --git a/chapter06/glibc-pass2-inst.xml b/chapter06/glibc-pass2-inst.xml
deleted file mode 100644
index 5fde85f3b..000000000
--- a/chapter06/glibc-pass2-inst.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Installation of Glibc</title>
-
-<para>At the beginning of this chapter you installed Glibc and applied a
-patch to it. Part of this patch was undoing some changes to make static
-binaries compiled against Glibc-2.2 work. However, this is not what the
-Glibc developers intended and we don't need to keep this modified Glibc
-around. So we reinstall Glibc here to remove this patch.</para>
-
-<para>A second reason to install Glibc again is because it's considered
-cleaner. The first Glibc was installed using programs compiled on your host
-distribution which sometimes has the effect of tainting Glibc. While this
-isn't a problem with the other packages compiled early in this chapter, for
-Glibc we want to be sure it's 100% OK (although feel free to reinstall
-other packages at this point so you can say you compiled an LFS system with
-LFS. Much like GCC's bootstrap installation method).</para>
-
-<para>We'll also install the linuxthreads man pages here. As you may
-recall, during the first installation of Glibc this wasn't possible because
-Perl wasn't installed yet. Now that everything needed to install the Glibc
-linuxthreads man pages is present as well, we will install those too.</para>
-
-<para>Before starting to install Glibc, you must cd into the
-glibc-&glibc-version; directory and unpack glibc-linuxthreads inside
-the glibc-&glibc-version; directory, not in /usr/src as you normally
-would do.</para>
-
-<para>This package is known to behave badly when you have changed its
-default optimization flags (including the -march and -mcpu options).
-Therefore, if you have defined any environment variables that override
-default optimizations, such as CFLAGS and CXXFLAGS, we recommend unsetting
-or modifying them when building Glibc. You have been warned.</para>
-
-<para>Basically, compiling Glibc in any other way than the book suggests
-is putting your system at very high risk.</para>
-
-<para>It is recommended by the Glibc installation documentation to build
-Glibc outside of the source tree. Create the build directory:</para>
-
-<para><screen><userinput>mkdir ../glibc-build &amp;&amp;
-cd ../glibc-build</userinput></screen></para>
-
-<para>Next, prepare Glibc to be compiled:</para>
-
-<para><screen><userinput>../glibc-&glibc-version;/configure --prefix=/usr --disable-profile \
-&nbsp;&nbsp;&nbsp;&nbsp;--enable-add-ons --libexecdir=/usr/bin</userinput></screen></para>
-
-<para>Continue with compiling the package:</para>
-
-<para><screen><userinput>make</userinput></screen></para>
-
-<para>Begin package installation:</para>
-
-<para><screen><userinput>make install</userinput></screen></para>
-
-<para>Build the linuxthreads man pages:</para>
-
-<para><screen><userinput>make -C ../glibc-&glibc-version;/linuxthreads/man</userinput></screen></para>
-
-<para>Install the man pages:</para>
-
-<para><screen><userinput>make -C ../glibc-&glibc-version;/linuxthreads/man install</userinput></screen></para>
-
-<para>Complete package installation by relaunching bash:</para>
-
-<para><screen><userinput>exec /bin/bash --login</userinput></screen></para>
-
-</sect2>
-
diff --git a/chapter06/glibc-pass2.xml b/chapter06/glibc-pass2.xml
deleted file mode 100644
index 9f06080b5..000000000
--- a/chapter06/glibc-pass2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<sect1 id="ch06-glibc-pass2">
-<title>Installing Glibc-&glibc-version;</title>
-<?dbhtml filename="glibc-pass2.html" dir="chapter06"?>
-
-<screen>Estimated build time: &glibc-pass2-time;
-Estimated required disk space: &glibc-pass2-compsize;</screen>
-
-&aa-glibc-shortdesc;
-&aa-glibc-dep;
-&c6-glibc-pass2-inst;
-
-</sect1>
-
diff --git a/entities/glibc.ent b/entities/glibc.ent
index bc44df6ff..f21b23823 100644
--- a/entities/glibc.ent
+++ b/entities/glibc.ent
@@ -7,8 +7,6 @@
<!ENTITY c6-glibc SYSTEM "../chapter06/glibc.xml">
<!ENTITY c6-glibc-inst SYSTEM "../chapter06/glibc-inst.xml">
-<!ENTITY c6-glibc-pass2 SYSTEM "../chapter06/glibc-pass2.xml">
-<!ENTITY c6-glibc-pass2-inst SYSTEM "../chapter06/glibc-pass2-inst.xml">
<!ENTITY c6-cf-glibc SYSTEM "../chapter06/config-glibc.xml">
<!ENTITY aa-glibc SYSTEM "../appendixa/glibc.xml">