[Clfs-commits] commit: r4615 - in /branches/clfs-sysroot/BOOK: final-system/alpha/perl.xml final-system/arm/perl.xml final-system/hppa/perl.xml final-system/x86/perl.xml introduction/common/changelog.xml

[svn at cross-lfs.org]

Author: jciccone
Date: Sat Jan 31 15:22:04 2009
New Revision: 4615

Log:
Add sed command to make perl use system-installed zlib

Modified:
    branches/clfs-sysroot/BOOK/final-system/alpha/perl.xml
    branches/clfs-sysroot/BOOK/final-system/arm/perl.xml
    branches/clfs-sysroot/BOOK/final-system/hppa/perl.xml
    branches/clfs-sysroot/BOOK/final-system/x86/perl.xml
    branches/clfs-sysroot/BOOK/introduction/common/changelog.xml

Modified: branches/clfs-sysroot/BOOK/final-system/alpha/perl.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/alpha/perl.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/alpha/perl.xml Sat Jan 31 15:22:04 2009
@@ -43,6 +43,14 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../arm/perl.xml"
+    xpointer="xpointer(//*[@os='s3'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../arm/perl.xml"
+    xpointer="xpointer(//*[@os='s4'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../arm/perl.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: branches/clfs-sysroot/BOOK/final-system/arm/perl.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/arm/perl.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/arm/perl.xml Sat Jan 31 15:22:04 2009
@@ -42,6 +42,16 @@
 <screen os="s2"><userinput>cp -v Makefile.SH{,.orig}
 sed -e "s at pldlflags=''@pldlflags=\"\$cccdlflags\"@g" \
     -e "s at static_target='static'@static_target='static_pic'@g" Makefile.SH.orig > Makefile.SH</userinput></screen>
+
+    <para os="s3">By default, Perl's Compress::Raw::Zlib module builds and
+    links against its own internal copy of Zlib. The following command will
+    tell it use the system-installed Zlib:</para>
+
+<screen os="s4"><userinput>cp -v ext/Compress/Raw/Zlib/config.in{,.orig}
+sed -e '/^BUILD_ZLIB/ s/True/False/' \
+        -e '/^INCLUDE\|^LIB/ s|\./zlib-src|/usr/include|' \
+        ext/Compress/Raw/Zlib/config.in.orig > \
+        ext/Compress/Raw/Zlib/config.in</userinput></screen>
 
     <para os="a">The Cross directory contains a Makefile for cross-compiling:</para>
 

Modified: branches/clfs-sysroot/BOOK/final-system/hppa/perl.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/hppa/perl.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/hppa/perl.xml Sat Jan 31 15:22:04 2009
@@ -43,6 +43,14 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../arm/perl.xml"
+    xpointer="xpointer(//*[@os='s3'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../arm/perl.xml"
+    xpointer="xpointer(//*[@os='s4'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../arm/perl.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: branches/clfs-sysroot/BOOK/final-system/x86/perl.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/x86/perl.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/x86/perl.xml Sat Jan 31 15:22:04 2009
@@ -43,6 +43,14 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../arm/perl.xml"
+    xpointer="xpointer(//*[@os='s3'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../arm/perl.xml"
+    xpointer="xpointer(//*[@os='s4'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../arm/perl.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: branches/clfs-sysroot/BOOK/introduction/common/changelog.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/introduction/common/changelog.xml (original)
+++ branches/clfs-sysroot/BOOK/introduction/common/changelog.xml Sat Jan 31 15:22:04 2009
@@ -39,6 +39,10 @@
     <listitem>
       <para>Janurary 31, 2009</para>
       <itemizedlist>
+        <listitem>
+          <para>[jciccone] - Added command to make Perl use system-installed
+          Zlib. Fixes ticket #201.</para>
+        </listitem>
         <listitem>
           <para>[jciccone] - Updated Host System Requirements.</para>
         </listitem>