diff options
| author | Hadrien G <knights_of_ni@gmx.com> | 2018-11-15 17:22:13 +0100 |
|---|---|---|
| committer | Adam J. Stewart <ajstewart426@gmail.com> | 2018-11-15 10:22:13 -0600 |
| commit | d7983e2aa4be4ebdea0659933356081588989c2f (patch) | |
| tree | 9b5b75df267b0415ebb44ab99db8aa760ee2596c | |
| parent | 32884dbc031a69521b4e71dae04507809b4feca3 (diff) | |
| download | spack-d7983e2aa4be4ebdea0659933356081588989c2f.tar.gz spack-d7983e2aa4be4ebdea0659933356081588989c2f.tar.bz2 spack-d7983e2aa4be4ebdea0659933356081588989c2f.tar.xz spack-d7983e2aa4be4ebdea0659933356081588989c2f.zip | |
Fix and update verrou (#9847)
* Fix verrou-python integration
* Add verrou 2.1.0
* Patch level changed in v2.1.0
| -rw-r--r-- | var/spack/repos/builtin/packages/verrou/package.py | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/verrou/package.py b/var/spack/repos/builtin/packages/verrou/package.py index d0cde05339..2ef067200e 100644 --- a/var/spack/repos/builtin/packages/verrou/package.py +++ b/var/spack/repos/builtin/packages/verrou/package.py @@ -25,13 +25,18 @@ class Verrou(AutotoolsPackage): git = "https://github.com/edf-hpc/verrou.git" version('develop', branch='master') + version('2.1.0', 'b1ba49f84aebab15b8ab5649946c9c31b53ad1499f6ffb681c98db41ed28566d') version('2.0.0', '388d493df3f253c9b049ce0ceae55fd6') version('1.1.0', '9752d776fb534890e5e29f9721ee6125') + resource(name='valgrind-3.14.0', + url='https://sourceware.org/pub/valgrind/valgrind-3.14.0.tar.bz2', + sha256='037c11bfefd477cc6e9ebe8f193bb237fe397f7ce791b4a4ce3fa1c6a520baa5', + when='@2.1.0:') resource(name='valgrind-3.13.0', url='https://sourceware.org/pub/valgrind/valgrind-3.13.0.tar.bz2', sha256='d76680ef03f00cd5e970bbdcd4e57fb1f6df7d2e2c071635ef2be74790190c3b', - when='@1.1.0:') + when='@1.1.0:2.0.99') variant('fma', default=True, description='Activates fused multiply-add support for Verrou') @@ -41,6 +46,10 @@ class Verrou(AutotoolsPackage): depends_on('libtool', type='build') depends_on('m4', type='build') + depends_on('python@:2.99.99', when='@1.1.0:2.0.99', type=('build', 'run')) + depends_on('python@3.0:', when='@2.1.0:', type=('build', 'run')) + extends('python') + def patch(self): # We start with the verrou source tree and a "valgrind-x.y.z" subdir. # But we actually need a valgrind source tree with a "verrou" subdir. @@ -60,7 +69,10 @@ class Verrou(AutotoolsPackage): os.rmdir(valgrind_dir) # Once this is done, we can patch valgrind - which('patch')('-p0', '--input=verrou/valgrind.diff') + if self.spec.satisfies('@:2.0.99'): + which('patch')('-p0', '--input=verrou/valgrind.diff') + else: + which('patch')('-p1', '--input=verrou/valgrind.diff') # Autogenerated perl path may be too long, need to fix this here # because these files are used during the build. |