[Clfs-commits] commit: r4517 - in /trunk/BOOK: final-system/common/perl.xml final-system/multilib/perl-64bit.xml final-system/multilib/perl-n32.xml final-system/multilib/perl.xml introduction/common/changelog.xml

[svn at cross-lfs.org]

Author: chris at beaker67.com
Date: Wed Jan 21 20:11:31 2009
New Revision: 4517

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

Modified:
    trunk/BOOK/final-system/common/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/introduction/common/changelog.xml

Modified: trunk/BOOK/final-system/common/perl.xml
==============================================================================
--- trunk/BOOK/final-system/common/perl.xml (original)
+++ trunk/BOOK/final-system/common/perl.xml Wed Jan 21 20:11:31 2009
@@ -31,6 +31,14 @@
 
 <screen os="s2"><userinput>sed -i -e "s at pldlflags=''@pldlflags=\"\$cccdlflags\"@g" \
     -e "s at static_target='static'@static_target='static_pic'@g" 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>sed -i -e '/^BUILD_ZLIB/ s/True/False/' \
+        -e '/^INCLUDE\|^LIB/ s|\./zlib-src|/usr/include|' \
+        ext/Compress/Raw/Zlib/config.in</userinput></screen>
 
     <note os="a00">
       <para>If you are following the boot method you will need to enable the

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 Wed Jan 21 20:11:31 2009
@@ -28,6 +28,14 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
     xpointer="xpointer(//*[@os='s2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/perl.xml"
+    xpointer="xpointer(//*[@os='s3'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/perl.xml"
+    xpointer="xpointer(//*[@os='s4'])"/>
 
     <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>

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 Wed Jan 21 20:11:31 2009
@@ -29,6 +29,14 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
     xpointer="xpointer(//*[@os='s2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/perl.xml"
+    xpointer="xpointer(//*[@os='s3'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/perl.xml"
+    xpointer="xpointer(//*[@os='s4'])"/>
 
     <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 Wed Jan 21 20:11:31 2009
@@ -29,6 +29,14 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
     xpointer="xpointer(//*[@os='s2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/perl.xml"
+    xpointer="xpointer(//*[@os='s3'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/perl.xml"
+    xpointer="xpointer(//*[@os='s4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"

Modified: trunk/BOOK/introduction/common/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/common/changelog.xml (original)
+++ trunk/BOOK/introduction/common/changelog.xml Wed Jan 21 20:11:31 2009
@@ -35,6 +35,16 @@
       </itemizedlist>
     </listitem>
 -->
+
+    <listitem>
+      <para>January 21, 2009</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Chris] - Added command to make Perl use system-installed
+          Zlib. Fixes ticket #201.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>
       <para>January 20, 2009</para>