Changeset c3d197b in clfs-sysroot for BOOK

Timestamp:

Jan 31, 2009, 7:22:04 AM (16 years ago)

Author:

Joe Ciccone <jciccone@…>

Branches:

master

Children:

af447da

Parents:

853465d

Message:

Add sed command to make perl use system-installed zlib

Location:

BOOK

Files:

• final-system/alpha/perl.xml (modified) (1 diff)
• final-system/arm/perl.xml (modified) (1 diff)
• final-system/hppa/perl.xml (modified) (1 diff)
• final-system/x86/perl.xml (modified) (1 diff)
• introduction/common/changelog.xml (modified) (1 diff)

BOOK/final-system/alpha/perl.xml

@@ -44 +44 @@
     <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'])"/>
 

BOOK/final-system/arm/perl.xml

@@ -43 +43 @@
 sed -e "s@pldlflags=''@pldlflags=\"\$cccdlflags\"@g" \
     -e "s@static_target='static'@static_target='static_pic'@g" Makefile.SH.orig &gt; 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 &gt; \
+        ext/Compress/Raw/Zlib/config.in</userinput></screen>
 
     <para os="a">The Cross directory contains a Makefile for cross-compiling:</para>

BOOK/final-system/hppa/perl.xml

@@ -44 +44 @@
     <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'])"/>
 

BOOK/final-system/x86/perl.xml

@@ -44 +44 @@
     <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'])"/>
 

BOOK/introduction/common/changelog.xml

@@ -40 +40 @@
       <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>