From cb62ac1d7f326af6182e0f18d776951896492828 Mon Sep 17 00:00:00 2001
From: Gerard Beekmans <gerard@linuxfromscratch.org>
Date: Sat, 27 Jan 2001 01:32:13 +0000
Subject: Moved Glibc to chapter 6

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@47 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter05/chapter5.sgml   |  4 ++-
 chapter05/glibc-exp.sgml  | 29 --------------------
 chapter05/glibc-inst.sgml | 67 -----------------------------------------------
 chapter05/glibc.sgml      |  8 ------
 4 files changed, 3 insertions(+), 105 deletions(-)
 delete mode 100644 chapter05/glibc-exp.sgml
 delete mode 100644 chapter05/glibc-inst.sgml
 delete mode 100644 chapter05/glibc.sgml

(limited to 'chapter05')

diff --git a/chapter05/chapter5.sgml b/chapter05/chapter5.sgml
index 0b0cc874a..4156e916e 100644
--- a/chapter05/chapter5.sgml
+++ b/chapter05/chapter5.sgml
@@ -10,7 +10,6 @@
 &c5-pp-fileutils;
 &c5-pp-gcc;
 &c5-pp-kernel;
-&c5-pp-glibc;
 &c5-pp-grep;
 &c5-pp-gzip;
 &c5-pp-make;
@@ -18,6 +17,9 @@
 &c5-pp-shellutils;
 &c5-pp-tar;
 &c5-pp-textutils;
+&c5-pp-mawk;
+&c5-pp-texinfo;
+&c5-pp-gettext;
 &c5-pp-pwdgroup;
 &c5-pp-proc;
 
diff --git a/chapter05/glibc-exp.sgml b/chapter05/glibc-exp.sgml
deleted file mode 100644
index b325b739d..000000000
--- a/chapter05/glibc-exp.sgml
+++ /dev/null
@@ -1,29 +0,0 @@
-<sect2>
-<title>Command explanations</title>
-
-<para>
-<userinput>patch -Np1 -i ../glibc-2.1.3.patch:</userinput>  This applies
-a patch that fixes a minor bug in Glibc. Glibc defines a few variables
-names with illegal characters in the name. Bash-2.03 and older don't
-complain about that but Bash-2.04 does and won't compile Glibc properly.
-</para>
-
-<para>
-<userinput>--enable-add-ons:</userinput> This enabled the add-ons that
-we install with Glibc: linuxthreads and crypt.
-</para>
-
-<para>
-<userinput>--with-headers=$LFS/usr/include:</userinput> This makes Glibc
-use the kernel header files on our LFS system and not the kernel header
-files from your starting distribution which may be out-of-date or
-modified.
-</para>
-
-<para>
-<userinput>make install_root=$LFS:</userinput> This is the Glibc way to
-specify the equivalent of --prefix=.
-</para>
-
-</sect2>
-
diff --git a/chapter05/glibc-inst.sgml b/chapter05/glibc-inst.sgml
deleted file mode 100644
index e261844d7..000000000
--- a/chapter05/glibc-inst.sgml
+++ /dev/null
@@ -1,67 +0,0 @@
-<sect2>
-<title>Installation of Glibc</title>
-
-<para>
-Unpack the glibc-crypt and glibc-linuxthreads in the glibc-2.1.3
-directory, not in /usr/src. Don't enter the created directories. Just 
-unpack them and leave it with that.
-</para>
-
-<para>
-A few default parameters of Glibc need to be changed, such as the
-directory where the shared libraries are supposed to be installed in and
-the directory that contains the system configuration files. For this
-purpose you need to create the <filename class="directory">
-$LFS/usr/src/glibc-build</filename> directory and cd into that directory
-with:
-</para>
-
-<blockquote><literallayout>
-
-	<userinput>mkdir /usr/src/glibc-build &amp;&amp;</userinput>
-	<userinput>cd /usr/src/glibc-build</userinput>
-
-</literallayout></blockquote>
-
-<para>
-In that directory you create a new file <filename>configparms</filename> 
-by running the following:
-</para>
-
-<literallayout>
-
-<userinput>cat &gt; configparms &lt;&lt; "EOF"</userinput>
-# Begin configparms
-
-slibdir=/lib
-sysconfdir=/etc
-
-# End configparms
-<userinput>EOF</userinput>
-
-</literallayout>
-
-<para>
-Change to the
-<filename class="directory">$LFS/usr/src/glibc-build</filename>
-directory and install Glibc by running the following commands:
-</para>
-
-<blockquote><literallayout>
-
-	<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 
-		\</userinput>
-	<userinput>&nbsp;&nbsp;&nbsp;--libexecdir=/usr/bin &amp;&amp;
-		</userinput>
-	<userinput>make &amp;&amp;</userinput>
-	<userinput>make install &amp;&amp;</userinput>
-	<userinput>make localedata/install-locales</userinput>
-
-</literallayout></blockquote>
-
-</sect2>
-
diff --git a/chapter05/glibc.sgml b/chapter05/glibc.sgml
deleted file mode 100644
index deafc69a2..000000000
--- a/chapter05/glibc.sgml
+++ /dev/null
@@ -1,8 +0,0 @@
-<sect1 id="ch05-glibc">
-<title>Installing Glibc</title>
-
-&c5-pp-glibc-inst;
-&c5-pp-glibc-exp;
-&aa-glibc-desc;
-
-</sect1>
-- 
cgit v1.2.3-54-g00ecf