Changeset ea2dfe7

Timestamp:

05/27/2009 06:33:49 AM (15 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

10.0, 10.0-rc1, 10.1, 10.1-rc1, 11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, 6.5, 6.6, 6.7, 6.8, 7.0, 7.1, 7.2, 7.3, 7.4, 7.5, 7.5-systemd, 7.6, 7.6-systemd, 7.7, 7.7-systemd, 7.8, 7.8-systemd, 7.9, 7.9-systemd, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, arm, bdubbs/gcc13, ml-11.0, multilib, renodr/libudev-from-systemd, s6-init, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

2ed4b452

Parents:

13fe71e

Message:

Revert zlib to doing separate builds for
static and dynamic libraries to ensure the -fPIC parameter
is set properly in both cases.

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

Files:

• chapter01/changelog.xml (modified) (1 diff)
• chapter01/whatsnew.xml (modified) (1 diff)
• chapter06/zlib.xml (modified) (2 diffs)
• general.ent (modified) (1 diff)

chapter01/changelog.xml

@@ -42 +42 @@
       <itemizedlist>
         <listitem>
+          <para>[bdubbs] - Revert zlib to doing separate builds for
+          static and dynamic libraries to ensure the -fPIC parameter
+          is set properly in both cases.
+          Fixes <ulink url="&lfs-ticket-root;2329">#2329</ulink> (again).</para>
+        </listitem>
+        <listitem>
           <para>[bdubbs] - Update gettext patch to -2 for an additional 
           bug fix.  Thanks to Robert Connolly for the patch.

chapter01/whatsnew.xml

@@ -308 +308 @@
       <para>vim-7.2-fixes-3.patch</para>
     </listitem>
+    <!--
     <listitem>
       <para>zlib-1.2.3-fPIC-1.patch</para>
     </listitem>
-
+    -->
   </itemizedlist>
 

chapter06/zlib.xml

@@ -48 +48 @@
       <parameter>-fPIC</parameter> directive to the <envar>CFLAGS</envar>
       variable for the duration of the configure command below, then
-      remove it afterwards.</para>
+      remove it when building the static library.</para>
     </note>
 
-    <para>Modify the build scripts to ensure compilation with position independent
-    code and allow building both static and dynamic libraries in one step:</para>
+    <para>Prepare Zlib for building the dynamic library:</para>
 
-<screen><userinput remap="configure">patch -Np1 -i ../&zlib-fpic-patch;</userinput></screen>
-
-    <para>Prepare Zlib for compilation:</para>
-
-<screen><userinput remap="configure">./configure --prefix=/usr --shared</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/usr --shared --libdir=/lib</userinput></screen>
 
     <para>Compile the package:</para>
@@ -68 +63 @@
 <screen><userinput remap="test">make check</userinput></screen>
 
-    <para>Install the libraries:</para>
+    <para>Install the shared library:</para>
 
 <screen><userinput remap="install">make install</userinput></screen>
 
-    <para>Finally, fix permissions on the static library:</para>
+    <para>The previous command installed a <filename
+    class="extension">.so</filename> file in <filename
+    class="directory">/lib</filename>. We will remove it and relink it into
+    <filename class="directory">/usr/lib</filename>:</para>
 
-<screen><userinput remap="install">chmod 0644 /usr/lib/libz.a</userinput></screen>
+<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>

general.ent

@@ -1 +1 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "SVN-20090526">
-<!ENTITY releasedate "May 26, 2009">
+<!ENTITY version "SVN-20090527">
+<!ENTITY releasedate "May 27, 2009">
 <!ENTITY copyrightdate "1999-2009"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone "6.5">