diff options
| author | George Hartzell <hartzell@alerce.com> | 2017-05-26 20:08:40 -0700 |
|---|---|---|
| committer | Adam J. Stewart <ajstewart426@gmail.com> | 2017-05-26 22:08:40 -0500 |
| commit | 1d80a879960191ad82cb8d78b58ef58d04537b2b (patch) | |
| tree | 64ad4c657c662b2d43e6afac573041f0e8c9ab75 /var | |
| parent | 248fc92a459d8587dc3b61a98642b945d8b98f7c (diff) | |
| download | spack-1d80a879960191ad82cb8d78b58ef58d04537b2b.tar.gz spack-1d80a879960191ad82cb8d78b58ef58d04537b2b.tar.bz2 spack-1d80a879960191ad82cb8d78b58ef58d04537b2b.tar.xz spack-1d80a879960191ad82cb8d78b58ef58d04537b2b.zip | |
Fix mummerplot when ^perl@5.20: (#4348)
* Fix mummerplot when ^perl@5.20:
Calling defined() on a hash has been deprecated for ages. It became
an error in perl@5.20. If we're building with a perl where it's
illegal, we should fix it.
* Simplify call to filter_file
Treat the first arg to filter_file as a string rather than
a regex, so that we don't have to figure out the escapes.
* Patch mummerplot for *any* perl version.
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/mummer/package.py | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/mummer/package.py b/var/spack/repos/builtin/packages/mummer/package.py index 222aab54b7..b8cd61531c 100644 --- a/var/spack/repos/builtin/packages/mummer/package.py +++ b/var/spack/repos/builtin/packages/mummer/package.py @@ -39,6 +39,14 @@ class Mummer(Package): patch('Makefile.patch') patch('scripts-Makefile.patch') + def patch(self): + """Fix mummerplot's use of defined on hashes (deprecated + since perl@5.10, made illegal in perl@5.20.""" + + kwargs = {'string': True} + filter_file('defined (%', '(%', 'scripts/mummerplot.pl', + **kwargs) + def install(self, spec, prefix): if self.run_tests: make('check') |