Trunk is now identical to Testing

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@4648 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

1 files changed, 38 insertions, 7 deletions

diff --git a/chapter06/zlib.xml b/chapter06/zlib.xml
index 606751c8d..77c731ba9 100644
--- a/chapter06/zlib.xml
+++ b/chapter06/zlib.xml
@@ -3,13 +3,15 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-zlib" xreflabel="Zlib" role="wrap">
+<sect1 id="ch-system-zlib" role="wrap">
 <title>Zlib-&zlib-version;</title>
 <?dbhtml filename="zlib.html"?>
 
 <indexterm zone="ch-system-zlib"><primary sortas="a-Zlib">Zlib</primary></indexterm>
 
 <sect2 role="package"><title/>
+<para>The Zlib package contains compression and un-compression routines used by
+some programs.</para>
 
 <segmentedlist>
 <segtitle>&buildtime;</segtitle>
@@ -17,12 +19,22 @@
 <seglistitem><seg>0.1 SBU</seg><seg>1.5 MB</seg></seglistitem>
 </segmentedlist>
 
+<segmentedlist>
+<segtitle>Zlib installation depends on</segtitle>
+<seglistitem><seg>Binutils, Coreutils, GCC, Glibc, Make, and Sed</seg></seglistitem>
+</segmentedlist>
 </sect2>
 
 <sect2 role="installation">
 <title>Installation of Zlib</title>
 
-<!-- NEW set of commands-->
+<note><para>Zlib is known to build its shared library incorrectly if
+<envar>CFLAGS</envar> is specified in the environment. If using a 
+specified <envar>CFLAGS</envar>
+variable, be sure to add the <parameter>-fPIC</parameter> directive to
+the <envar>CFLAGS</envar> variable for the duration of the
+configure command below, then remove it afterwards.</para></note>
+
 <para>Prepare Zlib for compilation:</para>
 
 <screen><userinput>./configure --prefix=/usr --shared --libdir=/lib</userinput></screen>
@@ -38,25 +50,27 @@
 
 <screen><userinput>make install</userinput></screen>
 
-<para>Now we will remove the old, .so files in /lib and relink them into /usr/lib.</para>
+<para>Next we will remove the old, <filename>.so</filename> files in
+the <filename class="directory">/lib</filename> directory and relink them
+into <filename class="directory">/usr/lib</filename>.</para>
 
 <screen><userinput>rm /lib/libz.so
 ln -sf ../../lib/libz.so.&zlib-version; /usr/lib/libz.so</userinput></screen>
 
-<para>Now also build the non-shared (static) library:</para>
+<para>Build the static library:</para>
 
 <screen><userinput>make clean
 ./configure --prefix=/usr
 make</userinput></screen>
 
-<para>To again test the results, issue:
+<para>To test the results again, issue:
 <userinput>make check</userinput>.</para>
 
 <para>Install the static library:</para>
 
 <screen><userinput>make install</userinput></screen>
 
-<para>And fix the permissions on the static library:</para>
+<para>Fix the permissions on the static library:</para>
 
 <screen><userinput>chmod 644 /usr/lib/libz.a</userinput></screen>
 
@@ -65,8 +79,25 @@ make</userinput></screen>
 
 <sect2 id="contents-zlib" role="content"><title>Contents of Zlib</title>
 
-<para>See testing</para>
+<segmentedlist>
+<segtitle>Installed libraries</segtitle>
+<seglistitem><seg>libz[a,so]</seg></seglistitem>
+</segmentedlist>
+
+<variablelist><bridgehead renderas="sect3">Short Descriptions</bridgehead>
+<?dbfo list-presentation="list"?>
+
+<varlistentry id="libz">
+<term><filename class="libraryfile">libz</filename></term>
+<listitem>
+<para>Contains compression and un-compression
+functions used by some programs</para>
+<indexterm zone="ch-system-zlib libz"><primary sortas="c-libz">libz</primary></indexterm>
+</listitem>
+</varlistentry>
+</variablelist>
 
 </sect2>
 
 </sect1>
+