[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, master, updated. 6cd0ea52e2cddd3917bbb6cffd2479f089c4683e
git
git at cross-lfs.org
Sun Aug 1 17:28:34 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 6cd0ea52e2cddd3917bbb6cffd2479f089c4683e (commit)
via cff82f59e906d0d18ef22fb54da9feee0fd35f18 (commit)
via c7fdd488de76c40a55440cf9d1afc6992b4fefcd (commit)
via 3f77b4224d09d196be8aed3a65c76ff3ad254540 (commit)
from 1341743466cebe69e86977aebaf450e646019500 (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 6cd0ea52e2cddd3917bbb6cffd2479f089c4683e
Author: Joe Ciccone <jciccone at gmail.com>
Date: Sun Aug 1 20:29:05 2010 -0400
Fix a compilation with GMP in the final system.
diff --git a/BOOK/final-system/multilib/gmp-n32.xml b/BOOK/final-system/multilib/gmp-n32.xml
index fc7bd20..2ec813c 100644
--- a/BOOK/final-system/multilib/gmp-n32.xml
+++ b/BOOK/final-system/multilib/gmp-n32.xml
@@ -38,7 +38,8 @@
<screen os="b"><userinput>CPPFLAGS=-fexceptions CC="gcc -isystem /usr/include ${BUILDN32}" \
CXX="g++ -isystem /usr/include ${BUILDN32}" \
- LDFLAGS="-Wl,-rpath-link,/lib32 ${BUILDN32}" ./configure --prefix=/usr \
+ LDFLAGS="-Wl,-rpath-link,/lib32 ${BUILDN32}" ABI=n32 \
+ ./configure --prefix=/usr \
--libdir=/usr/lib32 --enable-cxx --enable-mpbsd</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
diff --git a/BOOK/final-system/multilib/gmp.xml b/BOOK/final-system/multilib/gmp.xml
index 7a90fb6..a821783 100644
--- a/BOOK/final-system/multilib/gmp.xml
+++ b/BOOK/final-system/multilib/gmp.xml
@@ -38,8 +38,9 @@
<screen os="b"><userinput>CPPFLAGS=-fexceptions CC="gcc -isystem /usr/include ${BUILD32}" \
CXX="g++ -isystem /usr/include ${BUILD32}" \
- LDFLAGS="-Wl,-rpath-link,/lib ${BUILD32}" ./configure --prefix=/usr \
- --host=${CLFS_TARGET32} --enable-cxx --enable-mpbsd</userinput></screen>
+ LDFLAGS="-Wl,-rpath-link,/lib ${BUILD32}" ABI=32 \
+ ./configure --prefix=/usr \
+ -enable-cxx --enable-mpbsd</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../common/gmp.xml"
diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index a63ec63..5502f1a 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -40,6 +40,11 @@
<para>August 01, 2010</para>
<itemizedlist>
<listitem>
+ <para>[jciccone] - Fixed a compilation issue with GMP in the final
+ for 32bit on multilib. It handles the ABI differences on its own
+ now.</para>
+ </listitem>
+ <listitem>
<para>[jciccone] - Updated Man-Pages to 3.25.</para>
</listitem>
<listitem>
commit cff82f59e906d0d18ef22fb54da9feee0fd35f18
Author: Joe Ciccone <jciccone at gmail.com>
Date: Sun Aug 1 18:29:56 2010 -0400
Updated Man-Pages to 3.25.
diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index 71cb5ed..a63ec63 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -40,6 +40,9 @@
<para>August 01, 2010</para>
<itemizedlist>
<listitem>
+ <para>[jciccone] - Updated Man-Pages to 3.25.</para>
+ </listitem>
+ <listitem>
<para>[jciccone] - Updated Perl to 5.12.1.</para>
</listitem>
</itemizedlist>
diff --git a/BOOK/packages.ent b/BOOK/packages.ent
index b498408..2060f4c 100644
--- a/BOOK/packages.ent
+++ b/BOOK/packages.ent
@@ -284,10 +284,10 @@
<!ENTITY man-md5 "67aaaa6df35215e812fd7d89472c44b6">
<!ENTITY man-home "http://primates.ximian.com/~flucifredi/man">
-<!ENTITY man-pages-version "3.23">
-<!ENTITY man-pages-size "1,064 KB">
+<!ENTITY man-pages-version "3.25">
+<!ENTITY man-pages-size "1,588 KB">
<!ENTITY man-pages-url "&kernel;linux/docs/manpages/Archive/man-pages-&man-pages-version;.tar.bz2">
-<!ENTITY man-pages-md5 "153704ffa27160d708e0e8c56c1da58f">
+<!ENTITY man-pages-md5 "98ec2324abea77d7a992470dd44d140c">
<!ENTITY man-pages-home "http://www.win.tue.nl/~aeb/linux/man">
<!ENTITY module-init-tools-version "3.11.1">
commit c7fdd488de76c40a55440cf9d1afc6992b4fefcd
Author: Joe Ciccone <jciccone at gmail.com>
Date: Sun Aug 1 18:27:50 2010 -0400
Updated Perl to 5.12.1.
diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index 42f5712..71cb5ed 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -37,6 +37,15 @@
-->
<listitem>
+ <para>August 01, 2010</para>
+ <itemizedlist>
+ <listitem>
+ <para>[jciccone] - Updated Perl to 5.12.1.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>July 29, 2010</para>
<itemizedlist>
<listitem>
diff --git a/BOOK/packages.ent b/BOOK/packages.ent
index abdcb01..b498408 100644
--- a/BOOK/packages.ent
+++ b/BOOK/packages.ent
@@ -326,10 +326,10 @@
<!ENTITY patch-md5 "5729b1430ba6c2216e0f3eb18f213c81">
<!ENTITY patch-home "http://savannah.gnu.org/projects/patch">
-<!ENTITY perl-version "5.10.1">
-<!ENTITY perl-size "15,786 KB">
-<!ENTITY perl-url "http://ftp.funet.fi/pub/CPAN/src/perl-&perl-version;.tar.gz">
-<!ENTITY perl-md5 "b9b2fdb957f50ada62d73f43ee75d044">
+<!ENTITY perl-version "5.12.1">
+<!ENTITY perl-size "12,008 KB">
+<!ENTITY perl-url "http://ftp.funet.fi/pub/CPAN/src/perl-&perl-version;.tar.bz2">
+<!ENTITY perl-md5 "f7f2d7f5aaac15a75028381b159a560f">
<!ENTITY perl-home "http://www.perl.org">
<!ENTITY powerpcutils-version "1.1.3">
diff --git a/BOOK/patches.ent b/BOOK/patches.ent
index 05d6fdd..d912083 100644
--- a/BOOK/patches.ent
+++ b/BOOK/patches.ent
@@ -65,8 +65,8 @@
<!ENTITY ncurses-branch_update-patch-size "1,927 KB">
<!ENTITY perl-libc-patch "perl-&perl-version;-libc-1.patch">
-<!ENTITY perl-libc-patch-md5 "7597ce482d09fe48ad0a95d26902823b">
-<!ENTITY perl-libc-patch-size "1 KB">
+<!ENTITY perl-libc-patch-md5 "d572b0cc87b35f1806fd84f88803fb66">
+<!ENTITY perl-libc-patch-size "4 KB">
<!ENTITY readline-branch_update-patch "readline-&readline-version;-branch_update-2.patch">
<!ENTITY readline-branch_update-patch-md5 "1e92533f7b03e03bd0a73703d0d9cc75">
@@ -99,8 +99,8 @@
<!ENTITY iproute2-libdir-patch-size "2 KB">
<!ENTITY perl-multilib-patch "perl-&perl-version;-Configure_multilib-1.patch">
-<!ENTITY perl-multilib-patch-md5 "3db152a8071aa70eb038ebde28d53453">
-<!ENTITY perl-multilib-patch-size "1 KB">
+<!ENTITY perl-multilib-patch-md5 "1dd7df742630213d55c0749948baa9b9">
+<!ENTITY perl-multilib-patch-size "4 KB">
<!-- Start of Pure64 patches -->
diff --git a/patches/perl-5.10.1-Configure_multilib-1.patch b/patches/perl-5.12.1-Configure_multilib-1.patch
similarity index 79%
rename from patches/perl-5.10.1-Configure_multilib-1.patch
rename to patches/perl-5.12.1-Configure_multilib-1.patch
index 44fa816..cefca6b 100644
--- a/patches/perl-5.10.1-Configure_multilib-1.patch
+++ b/patches/perl-5.12.1-Configure_multilib-1.patch
@@ -1,6 +1,6 @@
Submitted By: Ryan Oliver <ryan dot oliver at pha dot com dot au>
-Date: 2009-08-25
-Initial Package Version: 5.10.1
+Date: 2010-08-01
+Initial Package Version: 5.8.8
Origin: Ryan Oliver
Upstream Status: Unknown
Description: This patch allows perl to be installed in /usr/lib32
@@ -8,11 +8,12 @@ Description: This patch allows perl to be installed in /usr/lib32
Rediffed: Against 5.10.0 by Joe Ciccone on 2008-08-30
Against 5.10.1 By Jim Gifford on 2009-08-25
+ Against 5.12.1 By Joe Ciccone on 2010-08-01
-diff -Naur perl-5.10.1.orig/Configure perl-5.10.1/Configure
---- perl-5.10.1.orig/Configure 2009-08-18 12:03:53.000000000 -0700
-+++ perl-5.10.1/Configure 2009-08-25 16:15:34.000000000 -0700
-@@ -6236,6 +6236,8 @@
+diff -Naur perl-5.12.1.orig/Configure perl-5.12.1/Configure
+--- perl-5.12.1.orig/Configure 2010-05-13 18:01:07.000000000 -0400
++++ perl-5.12.1/Configure 2010-08-01 18:18:19.614326794 -0400
+@@ -6254,6 +6254,8 @@
: The default "style" setting is made in installstyle.U
case "$installstyle" in
*lib/perl5*) set dflt privlib lib/$package/$version ;;
@@ -21,7 +22,7 @@ diff -Naur perl-5.10.1.orig/Configure perl-5.10.1/Configure
*) set dflt privlib lib/$version ;;
esac
eval $prefixit
-@@ -6484,6 +6486,8 @@
+@@ -6502,6 +6504,8 @@
case "$sitelib" in
'') case "$installstyle" in
*lib/perl5*) dflt=$siteprefix/lib/$package/site_$prog/$version ;;
@@ -30,7 +31,7 @@ diff -Naur perl-5.10.1.orig/Configure perl-5.10.1/Configure
*) dflt=$siteprefix/lib/site_$prog/$version ;;
esac
;;
-@@ -7002,6 +7006,8 @@
+@@ -7020,6 +7024,8 @@
prog=`echo $package | $sed 's/-*[0-9.]*$//'`
case "$installstyle" in
*lib/perl5*) dflt=$vendorprefix/lib/$package/vendor_$prog/$version ;;
diff --git a/patches/perl-5.10.1-libc-1.patch b/patches/perl-5.12.1-libc-1.patch
similarity index 75%
rename from patches/perl-5.10.1-libc-1.patch
rename to patches/perl-5.12.1-libc-1.patch
index 6f5cd2f..6c2599a 100644
--- a/patches/perl-5.10.1-libc-1.patch
+++ b/patches/perl-5.12.1-libc-1.patch
@@ -1,6 +1,6 @@
Submitted By: Ryan Oliver <ryan dot oliver at pha dot com dot au>
-Date: 2009-08-25
-Initial Package Version: 5.10.1
+Date: 2010-08-01
+Initial Package Version: 5.8.8
Origin: Ryan Oliver
Upstream Status: Unknown
Description: This patch adapts some hard-wired paths to the C library.
@@ -8,10 +8,11 @@ Description: This patch adapts some hard-wired paths to the C library.
Rediffed: Against 5.10.0 by Joe Ciccone on 2008-08-30
Against 5.10.1 By Jim Gifford on 2009-08-25
+ Against 5.12.1 By Joe Ciccone on 2010-08-01
-diff -Naur perl-5.10.1.orig/hints/linux.sh perl-5.10.1/hints/linux.sh
---- perl-5.10.1.orig/hints/linux.sh 2009-02-12 14:58:12.000000000 -0800
-+++ perl-5.10.1/hints/linux.sh 2009-08-25 16:20:12.000000000 -0700
+diff -Naur perl-5.12.1.orig/hints/linux.sh perl-5.12.1/hints/linux.sh
+--- perl-5.12.1.orig/hints/linux.sh 2010-04-26 04:09:20.000000000 -0400
++++ perl-5.12.1/hints/linux.sh 2010-08-01 18:19:24.558078088 -0400
@@ -63,9 +63,9 @@
# We don't use __GLIBC__ and __GLIBC_MINOR__ because they
# are insufficiently precise to distinguish things like
@@ -25,7 +26,7 @@ diff -Naur perl-5.10.1.orig/hints/linux.sh perl-5.10.1/hints/linux.sh
fi
# Configure may fail to find lstat() since it's a static/inline
-@@ -436,3 +436,8 @@
+@@ -441,3 +441,8 @@
libswanted="$libswanted pthread"
;;
esac
commit 3f77b4224d09d196be8aed3a65c76ff3ad254540
Author: Joe Ciccone <jciccone at gmail.com>
Date: Sun Aug 1 18:24:01 2010 -0400
Update Date.
diff --git a/BOOK/general.ent b/BOOK/general.ent
index 6ed0bee..dc416be 100644
--- a/BOOK/general.ent
+++ b/BOOK/general.ent
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY month "07"> <!-- Use two digits -->
-<!ENTITY month_name "July">
-<!ENTITY day "29"> <!-- Use two digits -->
+<!ENTITY month "08"> <!-- Use two digits -->
+<!ENTITY month_name "August">
+<!ENTITY day "01"> <!-- Use two digits -->
<!ENTITY year "2010"> <!-- Use four digits -->
<!ENTITY releasedate "&month_name; &day;, &year;">
-----------------------------------------------------------------------
Summary of changes:
BOOK/final-system/multilib/gmp-n32.xml | 3 ++-
BOOK/final-system/multilib/gmp.xml | 5 +++--
BOOK/general.ent | 6 +++---
BOOK/introduction/common/changelog.xml | 17 +++++++++++++++++
BOOK/packages.ent | 14 +++++++-------
BOOK/patches.ent | 8 ++++----
...atch => perl-5.12.1-Configure_multilib-1.patch} | 17 +++++++++--------
....10.1-libc-1.patch => perl-5.12.1-libc-1.patch} | 13 +++++++------
8 files changed, 52 insertions(+), 31 deletions(-)
rename patches/{perl-5.10.1-Configure_multilib-1.patch => perl-5.12.1-Configure_multilib-1.patch} (79%)
rename patches/{perl-5.10.1-libc-1.patch => perl-5.12.1-libc-1.patch} (75%)
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list