diff options
| author | Matthew Burgess <matthew@linuxfromscratch.org> | 2012-01-30 21:20:31 +0000 |
|---|---|---|
| committer | Matthew Burgess <matthew@linuxfromscratch.org> | 2012-01-30 21:20:31 +0000 |
| commit | e3f07935fcd137b019ee81e3d127947d341ce7d6 (patch) | |
| tree | 03ef33447a6b52b928d1fcb862c7f9079fb7c4da | |
| parent | 956dfc8bde5a57f543eb0a38ac38e1396c60f301 (diff) | |
Upgrade to Zlib-1.2.6. Fixes #3009.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9723 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
| -rw-r--r-- | chapter01/changelog.xml | 4 | ||||
| -rw-r--r-- | chapter01/whatsnew.xml | 4 | ||||
| -rw-r--r-- | chapter06/zlib.xml | 21 | ||||
| -rw-r--r-- | packages.ent | 6 |
4 files changed, 10 insertions, 25 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 727d3f9ac..5fb3ea90d 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -41,6 +41,10 @@ <para>2012-01-30</para> <itemizedlist> <listitem> + <para>[matthew] - Upgrade to Zlib-1.2.6. Fixes + <ulink url="&lfs-ticket-root;3009">#3009</ulink>.</para> + </listitem> + <listitem> <para>[matthew] - Move Xz to before GRUB so that the latter can support compressed kernel images.</para> </listitem> diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index 76e689459..1c7536bef 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -208,9 +208,9 @@ <!--<listitem> <para>XZ-Utils &xz-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 7461858ad..1dfa3a9bc 100644 --- a/chapter06/zlib.xml +++ b/chapter06/zlib.xml @@ -41,28 +41,9 @@ <sect2 role="installation"> <title>Installation of Zlib</title> - <para>First, fix a typo in the package header file:</para> - -<screen><userinput remap="pre">sed -i 's/ifdef _LARGEFILE64_SOURCE/ifndef _LARGEFILE64_SOURCE/' zlib.h</userinput></screen> - <para>Prepare Zlib for compilation:</para> -<screen><userinput remap="configure">CFLAGS='-mstackrealign -fPIC -O3' ./configure --prefix=/usr</userinput></screen> - - <variablelist> - <title>The meaning of the new configure environment variable:</title> - - <varlistentry> - <term><envar>CFLAGS='-mstackrealign -fPIC -O3'</envar></term> - <listitem> - <para>Setting CFLAGS overrides the default optimization in the - package to prevent some run time errors. Note that the -mstackrealign - may cause build failures in non-Intel architecture systems.</para> - </listitem> - </varlistentry> - </variablelist> - - +<screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen> <para>Compile the package:</para> diff --git a/packages.ent b/packages.ent index cce92da0e..7c94f3ffc 100644 --- a/packages.ent +++ b/packages.ent @@ -570,10 +570,10 @@ <!ENTITY xz-ch6-du "13 MB"> <!ENTITY xz-ch6-sbu "0.4 SBU"> -<!ENTITY zlib-version "1.2.5"> -<!ENTITY zlib-size "532 KB"> +<!ENTITY zlib-version "1.2.6"> +<!ENTITY zlib-size "490 KB"> <!ENTITY zlib-url "http://www.zlib.net/zlib-&zlib-version;.tar.bz2"> -<!ENTITY zlib-md5 "be1e89810e66150f5b0327984d8625a0"> +<!ENTITY zlib-md5 "dc2cfa0d2313ca77224b4d932b2911e9"> <!ENTITY zlib-home "http://www.zlib.net/"> <!ENTITY zlib-ch6-du "2.8 MB"> <!ENTITY zlib-ch6-sbu "less than 0.1 SBU"> |