From 0d9018b23cfd7eeb3d0bf187b38206af65eada5a Mon Sep 17 00:00:00 2001
From: Matthew Burgess <matthew@linuxfromscratch.org>
Date: Thu, 18 Mar 2010 19:56:39 +0000
Subject: Upgrade to Zlib-1.2.4. Fixes #2606.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9229 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter06/zlib.xml | 29 +----------------------------
 1 file changed, 1 insertion(+), 28 deletions(-)

(limited to 'chapter06')

diff --git a/chapter06/zlib.xml b/chapter06/zlib.xml
index c3c00730c..45edfe1ca 100644
--- a/chapter06/zlib.xml
+++ b/chapter06/zlib.xml
@@ -41,18 +41,9 @@
   <sect2 role="installation">
     <title>Installation of Zlib</title>
 
-    <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 when building the static library.</para>
-    </note>
-
     <para>Prepare Zlib for building the dynamic library:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr --shared --libdir=/lib</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/usr --libdir=/lib</userinput></screen>
 
     <para>Compile the package:</para>
 
@@ -74,24 +65,6 @@
 <screen><userinput remap="install">rm -v /lib/libz.so
 ln -sfv ../../lib/libz.so.&zlib-version; /usr/lib/libz.so</userinput></screen>
 
-    <para>Build the static library:</para>
-
-<screen><userinput remap="make">make clean
-./configure --prefix=/usr
-make</userinput></screen>
-
-    <para>To test the results again, issue:</para>
-
-<screen><userinput remap="test">make check</userinput></screen>
-
-    <para>Install the static library:</para>
-
-<screen><userinput remap="install">make install</userinput></screen>
-
-    <para>Fix the permissions on the static library:</para>
-
-<screen><userinput remap="install">chmod -v 644 /usr/lib/libz.a</userinput></screen>
-
   </sect2>
 
   <sect2 id="contents-zlib" role="content">
-- 
cgit v1.2.3-54-g00ecf