Changeset d10818d for BOOK/final-system/multilib

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/final-system/multilib

Files:

• perl-64bit.xml (modified) (2 diffs)
• perl-n32.xml (modified) (2 diffs)
• perl.xml (modified) (1 diff)
• temp-perl.xml (modified) (1 diff)

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"