Changeset 96d0fe5

Timestamp:

Sep 6, 2006, 9:29:01 AM (18 years ago)

Author:

Jim Gifford <clfs@…>

Branches:

clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

0de841f3

Parents:

2ca4197

Message:

Replace Perl FPIC patch with a sed.

Location:

BOOK

Files:

• final-system/common/perl.xml (modified) (1 diff)
• final-system/multilib/perl-64bit.xml (modified) (1 diff)
• final-system/multilib/perl-n32.xml (modified) (1 diff)
• final-system/multilib/perl.xml (modified) (1 diff)
• introduction/common/changelog.xml (modified) (1 diff)
• materials/common/patches.xml (modified) (1 diff)
• patches.ent (modified) (1 diff)

BOOK/final-system/common/perl.xml

@@ -26 +26 @@
     <title>Installation of Perl</title>
 
-    <para os="p1">The following patch causes <filename>DynaLoader.a</filename>
+    <para os="s1">The following sed causes <filename>DynaLoader.a</filename>
     to be built with -fPIC so it can be linked into a shared library
     later.</para>
 
-<screen os="p2"><userinput>patch -Np1 -i ../&perl-fpic-patch;</userinput></screen>
+<screen os="s2"><userinput>sed -i Makefile.SH \
+    -e "s@pldlflags=''@pldlflags=\"\$cccdlflags\"@g" \
+    -e "s@static_target='static'@static_target='static_pic'@g"</userinput></screen>
 
     <para os="a00">Before starting to configure, create a basic

BOOK/final-system/multilib/perl-64bit.xml

@@ -24 +24 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
+    xpointer="xpointer(//*[@os='s1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <para os="p3">Perl does not, by default, know about library directories with names other

BOOK/final-system/multilib/perl-n32.xml

@@ -25 +25 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
+    xpointer="xpointer(//*[@os='s1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

BOOK/final-system/multilib/perl.xml

@@ -25 +25 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
+    xpointer="xpointer(//*[@os='s1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

BOOK/introduction/common/changelog.xml

@@ -42 +42 @@
         <listitem>
           <para>[jim] - Removed the keymap settings from the kernel pages.</para>
+        </listitem>
+        <listitem>
+          <para>[jim] - Replace Perl FPIC patch with a sed, to make sure fpic is set correctly.</para>
         </listitem>
       </itemizedlist>

BOOK/materials/common/patches.xml

@@ -209 +209 @@
 
     <varlistentry>
-      <term>Perl fPIC Patch - <token>&perl-fpic-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&perl-fpic-patch;"/></para>
-        <para>MD5 sum: <literal>&perl-fpic-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
       <term>Perl Libc Patch - <token>&perl-libc-patch-size;</token>:</term>
       <listitem>

BOOK/patches.ent

@@ -147 +147 @@
 <!-- Start of multilib patches -->
 
-<!ENTITY perl-fpic-patch "perl-&perl-version;-fPIC-1.patch">
-<!ENTITY perl-fpic-patch-md5 "7d784d82b1366ab88b5fc265387d2a16">
-<!ENTITY perl-fpic-patch-size "4 KB">
-
 <!ENTITY binutils-multilib-patch "binutils-&binutils-version;-genscripts_multilib-1.patch">
 <!ENTITY binutils-multilib-patch-md5 "b1d8d22ab473212abf1b19978415775b">