aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--TODO2
-rw-r--r--chapter06/glibc-inst.sgml47
2 files changed, 9 insertions, 40 deletions
diff --git a/TODO b/TODO
index 975636724..f426e7313 100644
--- a/TODO
+++ b/TODO
@@ -1,7 +1,7 @@
These are the TODO items for the next LFS release (3.0):
* Move the explanations in MAKEDEV's installation to the "Command
-* explanation" section
+* explanation" section (also move from chap6 to chap5)
* Unmount $LFS/proc when done with chapter 7
diff --git a/chapter06/glibc-inst.sgml b/chapter06/glibc-inst.sgml
index eac593f04..cb405be61 100644
--- a/chapter06/glibc-inst.sgml
+++ b/chapter06/glibc-inst.sgml
@@ -2,61 +2,30 @@
<title>Installation of Glibc</title>
<para>
-Note: zoneinfo files (/usr/share/zoneinfo/*) are not being installed yet
-due to an unknown problem with the move to chapter 6.
-</para>
-
-<para>
Unpack the glibc-linuxthreads in the glibc-2.2.1 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">
-/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>
Install Glibc by running the following commands:
</para>
<blockquote><literallayout>
+ <userinput>touch /etc/ld.so.conf &amp;&amp;</userinput>
+ <userinput>mkdir /usr/src/glibc-build &amp;&amp;</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;--libexecdir=/usr/bin &amp;&amp;
</userinput>
+ <userinput>sed s/"cross-compiling = yes"/"cross-compiling = no"/
+ \</userinput>
+ <userinput>&nbsp;&nbsp;&nbsp;config.make &gt; config.make~
+ &amp;&amp;</userinput>
+ <userinput>mv config.make~ config.make &amp;&amp;</userinput>
<userinput>make &amp;&amp;</userinput>
<userinput>make install &amp;&amp;</userinput>
<userinput>make localedata/install-locales</userinput>