Changeset e74f725 for BOOK

Timestamp:

Aug 3, 2010, 6:23:10 PM (14 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:

06fcd8e

Parents:

08940008

Message:

Update seds for Perl 1.12.1.

Location:

BOOK/final-system

Files:

• common/perl.xml (modified) (1 diff)
• multilib/perl-64bit.xml (modified) (1 diff)
• multilib/perl-n32.xml (modified) (1 diff)
• multilib/perl.xml (modified) (1 diff)

BOOK/final-system/common/perl.xml

@@ -26 +26 @@
     <title>Installation of Perl</title>
 
-    <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
-    later:</para>
-
-<screen os="s2"><userinput>sed -i -e "s@pldlflags=''@pldlflags=\"\$cccdlflags\"@g" \
-    -e "s@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 to use the system-installed Zlib:</para>
 
-<screen os="s4"><userinput>sed -i -e '/^BUILD_ZLIB/ s/True/False/' \
-       -e '/^INCLUDE/s|\./zlib-src|/usr/include|' \
-       -e '/^LIB/s|\./zlib-src|/usr/lib|' \
-       ext/Compress-Raw-Zlib/config.in</userinput></screen>
+<screen os="s4"><userinput>sed -i -e '/^BUILD_ZLIB/s/True/False/' \
+       -e '/^INCLUDE/s,\./zlib-src,/usr/include,' \
+       -e '/^LIB/s,\./zlib-src,/usr/lib,' \
+       cpan/Compress-Raw-Zlib/config.in</userinput></screen>
 
     <note os="a00">

BOOK/final-system/multilib/perl-64bit.xml

@@ -24 +24 @@
     <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'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
     xpointer="xpointer(//*[@os='s3'])"/>
 
-<screen os="s4"><userinput>sed -i -e '/^BUILD_ZLIB/ s/True/False/' \
-       -e '/^INCLUDE/s|\./zlib-src|/usr/include|' \
-       -e '/^LIB/s|\./zlib-src|/usr/lib64|' \
-       ext/Compress-Raw-Zlib/config.in</userinput></screen>
+<screen os="s4"><userinput>sed -i -e '/^BUILD_ZLIB/s/True/False/' \
+       -e '/^INCLUDE/s,\./zlib-src,/usr/include,' \
+       -e '/^LIB/s,\./zlib-src,/usr/lib64,' \
+       cpan/Compress-Raw-Zlib/config.in</userinput></screen>
 
     <para os="mp1">Perl does not, by default, know about library directories with names other

BOOK/final-system/multilib/perl-n32.xml

@@ -25 +25 @@
     <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'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
     xpointer="xpointer(//*[@os='s3'])"/>
 
-<screen os="s4"><userinput>sed -i -e '/^BUILD_ZLIB/ s/True/False/' \
-       -e '/^INCLUDE/s|\./zlib-src|/usr/include|' \
-       -e '/^LIB/s|\./zlib-src|/usr/lib32|' \
-       ext/Compress-Raw-Zlib/config.in</userinput></screen>
+<screen os="s4"><userinput>sed -i -e '/^BUILD_ZLIB/s/True/False/' \
+       -e '/^INCLUDE/s,\./zlib-src,/usr/include,' \
+       -e '/^LIB/s,\./zlib-src,/usr/lib32,' \
+       cpan/Compress-Raw-Zlib/config.in</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

BOOK/final-system/multilib/perl.xml

@@ -22 +22 @@
   <sect2 role="installation">
     <title>Installation of Perl</title>
-
-    <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'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"