[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, master, updated. e74f725fe31a2ed43dcfd360eac77023e30aafa0
git
git at cross-lfs.org
Tue Aug 3 18:22:26 PDT 2010
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cross-LFS Book".
The branch, master has been updated
via e74f725fe31a2ed43dcfd360eac77023e30aafa0 (commit)
via 089400089f6e43ca055f1e14830d8cdedad0cb6d (commit)
from 7c59b6050acf71166eb2224e248c32fcab798d1e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit e74f725fe31a2ed43dcfd360eac77023e30aafa0
Author: Joe Ciccone <jciccone at gmail.com>
Date: Tue Aug 3 21:23:10 2010 -0400
Update seds for Perl 1.12.1.
diff --git a/BOOK/final-system/common/perl.xml b/BOOK/final-system/common/perl.xml
index 619f32b..24a243a 100644
--- a/BOOK/final-system/common/perl.xml
+++ b/BOOK/final-system/common/perl.xml
@@ -25,21 +25,14 @@
<sect2 role="installation">
<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 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 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">
<para>If you are following the boot method you will need to enable the
diff --git a/BOOK/final-system/multilib/perl-64bit.xml b/BOOK/final-system/multilib/perl-64bit.xml
index 0a94532..d968155 100644
--- a/BOOK/final-system/multilib/perl-64bit.xml
+++ b/BOOK/final-system/multilib/perl-64bit.xml
@@ -23,20 +23,12 @@
<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
than lib, The following patch will allow it to install to other directories:</para>
diff --git a/BOOK/final-system/multilib/perl-n32.xml b/BOOK/final-system/multilib/perl-n32.xml
index b7e7ce0..539bb32 100644
--- a/BOOK/final-system/multilib/perl-n32.xml
+++ b/BOOK/final-system/multilib/perl-n32.xml
@@ -24,20 +24,12 @@
<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"
href="perl-64bit.xml"
diff --git a/BOOK/final-system/multilib/perl.xml b/BOOK/final-system/multilib/perl.xml
index 05dfebb..906b4a1 100644
--- a/BOOK/final-system/multilib/perl.xml
+++ b/BOOK/final-system/multilib/perl.xml
@@ -24,14 +24,6 @@
<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'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
commit 089400089f6e43ca055f1e14830d8cdedad0cb6d
Author: Joe Ciccone <jciccone at gmail.com>
Date: Tue Aug 3 21:18:19 2010 -0400
Update Date.
diff --git a/BOOK/general.ent b/BOOK/general.ent
index 432218f..6b92c1d 100644
--- a/BOOK/general.ent
+++ b/BOOK/general.ent
@@ -2,7 +2,7 @@
<!ENTITY month "08"> <!-- Use two digits -->
<!ENTITY month_name "August">
-<!ENTITY day "02"> <!-- Use two digits -->
+<!ENTITY day "03"> <!-- Use two digits -->
<!ENTITY year "2010"> <!-- Use four digits -->
<!ENTITY releasedate "&month_name; &day;, &year;">
-----------------------------------------------------------------------
Summary of changes:
BOOK/final-system/common/perl.xml | 15 ++++-----------
BOOK/final-system/multilib/perl-64bit.xml | 16 ++++------------
BOOK/final-system/multilib/perl-n32.xml | 16 ++++------------
BOOK/final-system/multilib/perl.xml | 8 --------
BOOK/general.ent | 2 +-
5 files changed, 13 insertions(+), 44 deletions(-)
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list