From 201211cd3f4d6eac406908bc3c1fa8024df071d5 Mon Sep 17 00:00:00 2001
From: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date: Wed, 28 May 2014 17:05:24 +0200
Subject: [PATCH] version up : perl 5.20.0.
---
component/perl/buildout.cfg | 6 +++---
.../perl-keep-linker-flags-in-ldflags.patch | 20 +++++++++----------
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/component/perl/buildout.cfg b/component/perl/buildout.cfg
index 22b0b4f71..b0a6d8b49 100644
--- a/component/perl/buildout.cfg
+++ b/component/perl/buildout.cfg
@@ -9,15 +9,15 @@ parts =
recipe = slapos.recipe.cmmi
depends =
${gdbm:version}
-version = 5.18.2
+version = 5.20.0
# increase revision when we need to rebuild binary libraries.
revision = 1
url = http://www.cpan.org/src/5.0/perl-${:version}.tar.bz2
-md5sum = d549b16ee4e9210988da39193a9389c1
+md5sum = 20cbecd4e9e880ee7a50a136c8b1484e
siteprefix = ${buildout:parts-directory}/site_${:_buildout_section_name_}
patch-options = -p1
patches =
- ${:_profile_base_location_}/perl-keep-linker-flags-in-ldflags.patch#9873a89c969bd5a478434c3b8b2d57d8
+ ${:_profile_base_location_}/perl-keep-linker-flags-in-ldflags.patch#4e8e0c59d7176eafb0c7402dea17bef1
configure-command =
sh Configure -des \
-Dprefix=${buildout:parts-directory}/${:_buildout_section_name_} \
diff --git a/component/perl/perl-keep-linker-flags-in-ldflags.patch b/component/perl/perl-keep-linker-flags-in-ldflags.patch
index 0c62f082b..53d0b46c3 100644
--- a/component/perl/perl-keep-linker-flags-in-ldflags.patch
+++ b/component/perl/perl-keep-linker-flags-in-ldflags.patch
@@ -1,20 +1,20 @@
---- perl-5.12.3/Configure.orig 2011-01-09 21:20:52.000000000 +0100
-+++ perl-5.12.3/Configure 2011-01-26 19:33:33.106561007 +0100
-@@ -8092,16 +8092,7 @@
+--- perl-5.20.0/Configure.orig 2014-05-28 15:27:22.865060361 +0200
++++ perl-5.20.0/Configure 2014-05-28 15:32:14.297064994 +0200
+@@ -8277,16 +8277,7 @@
case "$dflt" in
- none) dflt='' ;;
+ none) dflt='' ;;
esac
- for thisflag in $ldflags; do
-- case "$thisflag" in
+- case "$thisflag" in
- -L*|-R*|-Wl,-R*)
-- case " $dflt " in
+- case " $dflt " in
- *" $thisflag "*) ;;
- *) dflt="$dflt $thisflag" ;;
-- esac
-- ;;
-- esac
+- esac
+- ;;
+- esac
- done
+ dflt="$dflt $ldflags"
case "$dflt" in
- ''|' ') dflt='none' ;;
+ ''|' ') dflt='none' ;;
--
2.30.9