Author: matthew
Date: 2010-03-18 13:56:39 -0600 (Thu, 18 Mar 2010)
New Revision: 9229
Modified:
trunk/BOOK/chapter01/changelog.xml
trunk/BOOK/chapter01/whatsnew.xml
trunk/BOOK/chapter06/zlib.xml
trunk/BOOK/packages.ent
Log:
Upgrade to Zlib-1.2.4. Fixes #2606.
Modified: trunk/BOOK/chapter01/changelog.xml
===================================================================
--- trunk/BOOK/chapter01/changelog.xml 2010-03-18 19:55:04 UTC (rev 9228)
+++ trunk/BOOK/chapter01/changelog.xml 2010-03-18 19:56:39 UTC (rev 9229)
@@ -41,6 +41,10 @@
<para>2010-03-18</para>
<itemizedlist>
<listitem>
+ <para>[matthew] Upgrade to Zlib-1.2.4. Fixes
+ <ulink url="&lfs-ticket-root;2606">#2606</ulink>.</para>
+ </listitem>
+ <listitem>
<para>[matthew] Upgrade to Tar-1.23. Fixes
<ulink url="&lfs-ticket-root;2603">#2603</ulink>.</para>
</listitem>
Modified: trunk/BOOK/chapter01/whatsnew.xml
===================================================================
--- trunk/BOOK/chapter01/whatsnew.xml 2010-03-18 19:55:04 UTC (rev 9228)
+++ trunk/BOOK/chapter01/whatsnew.xml 2010-03-18 19:56:39 UTC (rev 9229)
@@ -193,9 +193,9 @@
<!--<listitem>
<para>Vim &vim-version;</para>
</listitem>-->
- <!--<listitem>
+ <listitem>
<para>Zlib &zlib-version;</para>
- </listitem>-->
+ </listitem>
</itemizedlist>
<!--<itemizedlist>
Modified: trunk/BOOK/chapter06/zlib.xml
===================================================================
--- trunk/BOOK/chapter06/zlib.xml 2010-03-18 19:55:04 UTC (rev 9228)
+++ trunk/BOOK/chapter06/zlib.xml 2010-03-18 19:56:39 UTC (rev 9229)
@@ -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">
Modified: trunk/BOOK/packages.ent
===================================================================
--- trunk/BOOK/packages.ent 2010-03-18 19:55:04 UTC (rev 9228)
+++ trunk/BOOK/packages.ent 2010-03-18 19:56:39 UTC (rev 9229)
@@ -539,10 +539,10 @@
<!ENTITY vim-lang-md5 "d8884786979e0e520c112faf2e176f05">
<!ENTITY vim-lang-home "http://www.vim.org";>
-<!ENTITY zlib-version "1.2.3">
-<!ENTITY zlib-size "415 KB">
+<!ENTITY zlib-version "1.2.4">
+<!ENTITY zlib-size "472 KB">
<!ENTITY zlib-url "http://www.zlib.net/zlib-&zlib-version;.tar.bz2";>
-<!ENTITY zlib-md5 "dee233bf288ee795ac96a98cc2e369b6">
+<!ENTITY zlib-md5 "763c6a0b4ad1cdf5549e3ab3f140f4cb">
<!ENTITY zlib-home "http://www.zlib.net/";>
<!ENTITY zlib-ch6-du "2.8 MB">
<!ENTITY zlib-ch6-sbu "less than 0.1 SBU">
--
http://linuxfromscratch.org/mailman/listinfo/lfs-book
FAQ: http://www.linuxfromscratch.org/lfs/faq.html
Unsubscribe: See the above information page
