diff options
| author | George Hartzell <hartzell@alerce.com> | 2017-10-20 16:18:24 -0700 |
|---|---|---|
| committer | scheibelp <scheibel1@llnl.gov> | 2017-10-20 16:18:24 -0700 |
| commit | c9d9901e43aa067770e68b3be1dccddce70db48e (patch) | |
| tree | 1bccadfe30e6e5539550fd64c2a60134adf850fb | |
| parent | 2e1a96f2629732efc5f5382ef6b4d4459110d615 (diff) | |
| download | spack-c9d9901e43aa067770e68b3be1dccddce70db48e.tar.gz spack-c9d9901e43aa067770e68b3be1dccddce70db48e.tar.bz2 spack-c9d9901e43aa067770e68b3be1dccddce70db48e.tar.xz spack-c9d9901e43aa067770e68b3be1dccddce70db48e.zip | |
perl: add old version (#5844)
| -rw-r--r-- | var/spack/repos/builtin/packages/perl/package.py | 6 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/perl/protect-quotes-in-ccflags.patch | 36 |
2 files changed, 42 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/perl/package.py b/var/spack/repos/builtin/packages/perl/package.py index 5813d0f150..d54f5efff8 100644 --- a/var/spack/repos/builtin/packages/perl/package.py +++ b/var/spack/repos/builtin/packages/perl/package.py @@ -55,6 +55,7 @@ class Perl(Package): # Perl doesn't use Autotools, it should subclass Package # Misc releases that people need version('5.22.2', '5767e2a10dd62a46d7b57f74a90d952b') version('5.22.1', '19295bbb775a3c36123161b9bf4892f1') + version('5.22.0', 'e32cb6a8dda0084f2a43dac76318d68d') # End of life releases version('5.20.3', 'd647d0ea5a7a8194c34759ab9f2610cd') @@ -65,6 +66,11 @@ class Perl(Package): # Perl doesn't use Autotools, it should subclass Package depends_on('gdbm') + # there has been a long fixed issue with 5.22.0 with regard to the ccflags + # definition. It is well documented here: + # https://rt.perl.org/Public/Bug/Display.html?id=126468 + patch('protect-quotes-in-ccflags.patch', when='@5.22.0') + # Installing cpanm alongside the core makes it safe and simple for # people/projects to install their own sets of perl modules. Not # having it in core increases the "energy of activation" for doing diff --git a/var/spack/repos/builtin/packages/perl/protect-quotes-in-ccflags.patch b/var/spack/repos/builtin/packages/perl/protect-quotes-in-ccflags.patch new file mode 100644 index 0000000000..f3500d52f7 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl/protect-quotes-in-ccflags.patch @@ -0,0 +1,36 @@ +From 111bd177427ec912ef9d64a6d055ca5e9abc359d Mon Sep 17 00:00:00 2001 +From: Jarkko Hietaniemi <jhi@iki.fi> +Date: Wed, 28 Oct 2015 07:56:23 -0400 +Subject: [PATCH] For perl #126468: protect quotes in ccflags. + +--- + cflags.SH | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/cflags.SH b/cflags.SH +index f3e44ad..33c6c93 100755 +--- a/cflags.SH ++++ b/cflags.SH +@@ -387,6 +387,9 @@ echo "cflags.SH: warn = $warn" + # Code to set any extra flags here. + extra='' + ++# Protect double or single quotes. ++myccflags=`echo $ccflags | sed -e 's/"/\\\"/g' -e "s/'/\\\'/g"` ++ + echo "Extracting cflags (with variable substitutions)" + # This section of the file will have variable substitutions done on it. + # Move anything that needs config subs from !NO!SUBS! section to !GROK!THIS!. +@@ -401,7 +404,8 @@ $startsh + # This file is generated by cflags.SH + + # Used to restore possible edits by cflags.SH. +-myccflags="$ccflags" ++myccflags="$myccflags" ++ + # Extra warnings, used e.g. for gcc. + warn="$warn" + # Extra standardness. +-- +2.6.0 + |