From ec52ebbe6f1d52a04dc500e17bbb66f988178751 Mon Sep 17 00:00:00 2001 From: Matthew Burgess Date: Tue, 20 Apr 2010 20:07:18 +0000 Subject: Upgrade to Perl-5.12.0. Fixes #2635. git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9253 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- chapter01/changelog.xml | 4 ++++ chapter01/whatsnew.xml | 7 +++++-- chapter03/patches.xml | 15 --------------- chapter05/perl.xml | 4 ++-- chapter06/perl.xml | 7 +------ packages.ent | 6 +++--- patches.ent | 4 ---- 7 files changed, 15 insertions(+), 32 deletions(-) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 62cb7b463..b40c862ee 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -39,6 +39,10 @@ 2010-04-20 + + [matthew] Upgrade to Perl-5.12.0. Fixes + #2635. + [matthew] Upgrade to Kbd-1.15.2. Fixes #2634. diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index e6f2af558..fd3aa51ac 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -148,9 +148,9 @@ - + @@ -222,6 +222,9 @@ grep-2.5.4-debian_fixes-1.patch + + perl-5.10.1-utf8-1.patch + vim-7.2-fixes-5.patch diff --git a/chapter03/patches.xml b/chapter03/patches.xml index 1b17f5b24..6c28a6e75 100644 --- a/chapter03/patches.xml +++ b/chapter03/patches.xml @@ -147,21 +147,6 @@ - - Perl UTF8 Patch - &perl-utf8-patch-size;: - - Download: - MD5 sum: &perl-utf8-patch-md5; - - - Procps Watch Patch - &procps-watch-patch-size;: diff --git a/chapter05/perl.xml b/chapter05/perl.xml index 32cb79b07..d18fbfaf9 100644 --- a/chapter05/perl.xml +++ b/chapter05/perl.xml @@ -54,11 +54,11 @@ sed 's/command /command[ -]/' makedepend.SH.orig > makedepend.SH --> Prepare Perl for compilation (make sure to get the - 'Data/Dumper Fcntl IO POSIX' part of the command correct—they are all + 'Data/Dumper Fcntl IO' part of the command correct—they are all letters): sh Configure -des -Dprefix=/tools \ - -Dstatic_ext='Data/Dumper Fcntl IO POSIX' + -Dstatic_ext='Data/Dumper Fcntl IO' The meaning of the configure options: diff --git a/chapter06/perl.xml b/chapter06/perl.xml index 1f7fceb19..7487ca6ae 100644 --- a/chapter06/perl.xml +++ b/chapter06/perl.xml @@ -47,11 +47,6 @@ echo "127.0.0.1 localhost $(hostname)" > /etc/hosts - Fix a problem where invalid utf-8 characters cause a segmentation - fault: - -patch -Np1 -i ../&perl-utf8-patch; - This version of Perl now builds the Compress::Raw::Zlib module. By default Perl will use an internal copy of the Zlib source for the build. Issue the following command so that Perl will use the Zlib library @@ -60,7 +55,7 @@ sed -i -e "s|BUILD_ZLIB\s*= True|BUILD_ZLIB = False|" \ -e "s|INCLUDE\s*= ./zlib-src|INCLUDE = /usr/include|" \ -e "s|LIB\s*= ./zlib-src|LIB = /usr/lib|" \ - ext/Compress-Raw-Zlib/config.in + cpan/Compress-Raw-Zlib/config.in To have full control over the way Perl is set up, you can remove the -des options from the following command and hand-pick the way diff --git a/packages.ent b/packages.ent index 559e7dce3..b14dec3ef 100644 --- a/packages.ent +++ b/packages.ent @@ -394,10 +394,10 @@ - - + + - + diff --git a/patches.ent b/patches.ent index 278a847f3..2c312dc44 100644 --- a/patches.ent +++ b/patches.ent @@ -76,10 +76,6 @@ - - - - -- cgit v1.2.3-54-g00ecf