Changeset d10818d for BOOK

Timestamp:

Jun 28, 2008, 11:25:49 AM (16 years ago)

Author:

Joe Ciccone <jciccone@…>

Branches:

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

Children:

10de248

Parents:

973b8dd9

Message:

Add a patch to perl that prevents it from including asm/page.h. This resolves ticket 160 and future problems with kernel headers provided by 2.6.25 and forward.

Location:

BOOK

Files:

• final-system/common/perl.xml (modified) (1 diff)
• final-system/common/temp-perl.xml (modified) (1 diff)
• final-system/multilib/perl-64bit.xml (modified) (2 diffs)
• final-system/multilib/perl-n32.xml (modified) (2 diffs)
• final-system/multilib/perl.xml (modified) (1 diff)
• final-system/multilib/temp-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

@@ -31 +31 @@
 
 <screen os="p2"><userinput>patch -Np1 -i ../&perl-gcc42_fix-patch;</userinput></screen>
+
+    <para os="p3">The following patch prevents perl from including asm/page.h
+    which will no longer be available in headers provided by kernel 2.6.25 and
+    forward:</para>
+
+<screen os="p4"><userinput>patch -Np1 -i ../&perl-no_page_h-patch;</userinput></screen>
 
     <para os="s1">The following sed causes <filename>DynaLoader.a</filename>

BOOK/final-system/common/temp-perl.xml

@@ -30 +30 @@
     href="../common/perl.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/perl.xml"
+    xpointer="xpointer(//*[@os='p3'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/perl.xml"
+    xpointer="xpointer(//*[@os='p4'])"/>
 
     <para os="a">First adapt some hard-wired paths to the C library by applying

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

@@ -32 +32 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
+    xpointer="xpointer(//*[@os='p3'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/perl.xml"
+    xpointer="xpointer(//*[@os='p4'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/perl.xml"
     xpointer="xpointer(//*[@os='s1'])"/>
 
@@ -38 +46 @@
     xpointer="xpointer(//*[@os='s2'])"/>
 
-    <para os="p3">Perl does not, by default, know about library directories with names other
+    <para os="mp1">Perl does not, by default, know about library directories with names other
     than lib, The following patch will allow it to install to other directories:</para>
 
-<screen os="p4"><userinput>patch -Np1 -i ../&perl-multilib-patch;</userinput></screen>
+<screen os="mp2"><userinput>patch -Np1 -i ../&perl-multilib-patch;</userinput></screen>
 
     <para os="s1">There is a further (possibly cosmetic) anomaly - if we install perl and

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

@@ -33 +33 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
+    xpointer="xpointer(//*[@os='p3'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/perl.xml"
+    xpointer="xpointer(//*[@os='p4'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/perl.xml"
     xpointer="xpointer(//*[@os='s1'])"/>
 
@@ -41 +49 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="perl-64bit.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
+    xpointer="xpointer(//*[@os='mp1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="perl-64bit.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
+    xpointer="xpointer(//*[@os='mp2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

BOOK/final-system/multilib/perl.xml

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

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

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

BOOK/introduction/common/changelog.xml

@@ -40 +40 @@
       <para>June 28, 2008</para>
       <itemizedlist>
+        <listitem>
+          <para>[jciccone] - Added a patch to perl so it wont include asm/page.h.</para>
+        </listitem>
         <listitem>
           <para>[jciccone] - Updated the Vim Branch Update patch to -3.</para>

BOOK/materials/common/patches.xml

@@ -209 +209 @@
 
     <varlistentry>
+      <term>Perl No page.h Patch - <token>&perl-no_page_h-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink
+        url="&patches-root;&perl-no_page_h-patch;"/></para>
+        <para>MD5 sum: <literal>&perl-no_page_h-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
       <term>Readline Fixes - <token>&readline-fixes-patch-size;</token>:</term>
       <listitem>

BOOK/patches.ent

@@ -89 +89 @@
 <!ENTITY perl-libc-patch-size "4 KB">
 
+<!ENTITY perl-no_page_h-patch "perl-&perl-version;-no_page_h-1.patch">
+<!ENTITY perl-no_page_h-patch-md5 "fe49a8a539b14f53adfe24482c1fbe1f">
+<!ENTITY perl-no_page_h-patch-size "4 KB">
+
 <!ENTITY readline-fixes-patch "readline-&readline-version;-fixes-4.patch">
 <!ENTITY readline-fixes-patch-md5 "14ae1c3f3ff7223656f874bcf36e6f19">