Changeset 12fe1e5 in clfs-embedded for BOOK

Timestamp:

Nov 29, 2006, 7:43:19 PM (18 years ago)

Author:

Jim Gifford <clfs@…>

Branches:

master

Children:

d841e12

Parents:

764a956

Message:

Removed -fPIC patch

Location:

BOOK

Files:

• final-system/common/zlib.xml (modified) (1 diff)
• materials/common/patches.xml (modified) (1 diff)
• patches.ent (modified) (1 diff)

BOOK/final-system/common/zlib.xml

@@ -26 +26 @@
     <title>Installation of Zlib</title>
 
-    <para os="p1">This patch will add -fPIC to our build and allow us to build
-    a static and shared library at the same time:</para>
+    <para os="p1">This patch will add the ability to use DESTDIR:</para>
 
-<screen os="p2"><userinput>patch -Np1 -i ../&zlib-fpic-patch;</userinput></screen>
-
-    <para os="p3">This patch will add the ability to use DESTDIR:</para>
-
-<screen os="p4"><userinput>patch -Np1 -i ../&zlib-destdir-patch;</userinput></screen>
+<screen os="p2"><userinput>patch -Np1 -i ../&zlib-destdir-patch;</userinput></screen>
 
     <para os="a">Prepare Zlib for compilation:</para>

BOOK/materials/common/patches.xml

@@ -83 +83 @@
 
     <varlistentry>
-      <term>Zlib fPIC Patch - <token>&zlib-fpic-patch-size;</token>:</term> <listitem>
+      <term>Zlib DESTDIR Patch - <token>&zlib-destdir-patch-size;</token>:</term> <listitem>
         <para>Download: <ulink
-        url="&patches-root;&zlib-fpic-patch;"/></para>
-        <para>MD5 sum: <literal>&zlib-fpic-patch-md5;</literal></para>
+        url="&patches-root;&zlib-destdir-patch;"/></para>
+        <para>MD5 sum: <literal>&zlib-destdir-patch-md5;</literal></para>
       </listitem>
     </varlistentry>

BOOK/patches.ent

@@ -33 +33 @@
 <!ENTITY gcc-uclibc-patch-size "144 KB">
 
-<!ENTITY zlib-fpic-patch "zlib-&zlib-version;-fPIC-1.patch">
-<!ENTITY zlib-fpic-patch-md5 "545d60b20bfde6f53023de44438cef59">
-<!ENTITY zlib-fpic-patch-size "3.2 KB">
-
 <!ENTITY zlib-destdir-patch "zlib-&zlib-version;-DESTDIR-1.patch">
 <!ENTITY zlib-destdir-patch-md5 "d21bdd08bf444f87f275b6aef44e1a84">