[Clfs-commits] commit: r3928 - in /trunk: BOOK/ BOOK/final-system/common/ BOOK/final-system/multilib/ BOOK/introduction/common/ BOOK/materials/common/ patches/
svn at cross-lfs.org
svn at cross-lfs.org
Sat Jun 28 11:25:49 PDT 2008
Author: jciccone
Date: Sat Jun 28 18:25:49 2008
New Revision: 3928
Log:
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.
Added:
trunk/patches/perl-5.8.8-no_page_h-1.patch
Modified:
trunk/BOOK/final-system/common/perl.xml
trunk/BOOK/final-system/common/temp-perl.xml
trunk/BOOK/final-system/multilib/perl-64bit.xml
trunk/BOOK/final-system/multilib/perl-n32.xml
trunk/BOOK/final-system/multilib/perl.xml
trunk/BOOK/final-system/multilib/temp-perl.xml
trunk/BOOK/introduction/common/changelog.xml
trunk/BOOK/materials/common/patches.xml
trunk/BOOK/patches.ent
Modified: trunk/BOOK/final-system/common/perl.xml
==============================================================================
--- trunk/BOOK/final-system/common/perl.xml (original)
+++ trunk/BOOK/final-system/common/perl.xml Sat Jun 28 18:25:49 2008
@@ -30,6 +30,12 @@
<literal><command line></literal>:</para>
<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>
to be built with -fPIC so it can be linked into a shared library
Modified: trunk/BOOK/final-system/common/temp-perl.xml
==============================================================================
--- trunk/BOOK/final-system/common/temp-perl.xml (original)
+++ trunk/BOOK/final-system/common/temp-perl.xml Sat Jun 28 18:25:49 2008
@@ -29,6 +29,14 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
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
the following patch:</para>
Modified: trunk/BOOK/final-system/multilib/perl-64bit.xml
==============================================================================
--- trunk/BOOK/final-system/multilib/perl-64bit.xml (original)
+++ trunk/BOOK/final-system/multilib/perl-64bit.xml Sat Jun 28 18:25:49 2008
@@ -31,16 +31,24 @@
<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'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../common/perl.xml"
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
then run <command>perl -V</command> it will claim that libc is in /lib. The
Modified: trunk/BOOK/final-system/multilib/perl-n32.xml
==============================================================================
--- trunk/BOOK/final-system/multilib/perl-n32.xml (original)
+++ trunk/BOOK/final-system/multilib/perl-n32.xml Sat Jun 28 18:25:49 2008
@@ -32,6 +32,14 @@
<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'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -40,11 +48,11 @@
<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"
href="perl-64bit.xml"
Modified: trunk/BOOK/final-system/multilib/perl.xml
==============================================================================
--- trunk/BOOK/final-system/multilib/perl.xml (original)
+++ trunk/BOOK/final-system/multilib/perl.xml Sat Jun 28 18:25:49 2008
@@ -29,6 +29,14 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
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"
href="../common/perl.xml"
Modified: trunk/BOOK/final-system/multilib/temp-perl.xml
==============================================================================
--- trunk/BOOK/final-system/multilib/temp-perl.xml (original)
+++ trunk/BOOK/final-system/multilib/temp-perl.xml Sat Jun 28 18:25:49 2008
@@ -29,6 +29,14 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
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"
href="../common/temp-perl.xml"
Modified: trunk/BOOK/introduction/common/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/common/changelog.xml (original)
+++ trunk/BOOK/introduction/common/changelog.xml Sat Jun 28 18:25:49 2008
@@ -39,6 +39,9 @@
<listitem>
<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>
</listitem>
Modified: trunk/BOOK/materials/common/patches.xml
==============================================================================
--- trunk/BOOK/materials/common/patches.xml (original)
+++ trunk/BOOK/materials/common/patches.xml Sat Jun 28 18:25:49 2008
@@ -208,6 +208,15 @@
</varlistentry>
<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>
<para>Download: <ulink
Modified: trunk/BOOK/patches.ent
==============================================================================
--- trunk/BOOK/patches.ent (original)
+++ trunk/BOOK/patches.ent Sat Jun 28 18:25:49 2008
@@ -88,6 +88,10 @@
<!ENTITY perl-libc-patch-md5 "3bf8aef1fb6eb6110405e699e4141f99">
<!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">
<!ENTITY readline-fixes-patch-size "20 KB">
More information about the Clfs-commits
mailing list