diff options
| -rw-r--r-- | chapter01/changelog.xml | 4 | ||||
| -rw-r--r-- | chapter01/whatsnew.xml | 4 | ||||
| -rw-r--r-- | chapter06/zlib.xml | 29 | ||||
| -rw-r--r-- | packages.ent | 6 |
4 files changed, 10 insertions, 33 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 9d787ffe2..1119dfd94 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -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> diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index dd96e38e6..808f1412c 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -193,9 +193,9 @@ <!--<listitem> <para>Vim &vim-version;</para> </listitem>--> - <!--<listitem> + <listitem> <para>Zlib &zlib-version;</para> - </listitem>--> + </listitem> </itemizedlist> <!--<itemizedlist> 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"> diff --git a/packages.ent b/packages.ent index 32907bc2f..8943f99f7 100644 --- a/packages.ent +++ b/packages.ent @@ -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"> |