zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix and update verrou (#9847)

Browse Source 
* Fix verrou-python integration

* Add verrou 2.1.0

* Patch level changed in v2.1.0
This commit is contained in:
Hadrien G 2018-11-15 17:22:13 +01:00 committed by Adam J. Stewart
parent 32884dbc03
commit d7983e2aa4
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
var/spack/repos/builtin/packages/verrou/package.py
View File

@ -25,13 +25,18 @@ class Verrou(AutotoolsPackage):
git = "https://github.com/edf-hpc/verrou.git" git = "https://github.com/edf-hpc/verrou.git"
version('develop', branch='master') version('develop', branch='master')
version('2.1.0', 'b1ba49f84aebab15b8ab5649946c9c31b53ad1499f6ffb681c98db41ed28566d')
version('2.0.0', '388d493df3f253c9b049ce0ceae55fd6') version('2.0.0', '388d493df3f253c9b049ce0ceae55fd6')
version('1.1.0', '9752d776fb534890e5e29f9721ee6125') 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', resource(name='valgrind-3.13.0',
url='https://sourceware.org/pub/valgrind/valgrind-3.13.0.tar.bz2', url='https://sourceware.org/pub/valgrind/valgrind-3.13.0.tar.bz2',
sha256='d76680ef03f00cd5e970bbdcd4e57fb1f6df7d2e2c071635ef2be74790190c3b', sha256='d76680ef03f00cd5e970bbdcd4e57fb1f6df7d2e2c071635ef2be74790190c3b',
when='@1.1.0:') when='@1.1.0:2.0.99')
variant('fma', default=True, variant('fma', default=True,
description='Activates fused multiply-add support for Verrou') description='Activates fused multiply-add support for Verrou')
@ -41,6 +46,10 @@ class Verrou(AutotoolsPackage):
depends_on('libtool', type='build') depends_on('libtool', type='build')
depends_on('m4', 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): def patch(self):
# We start with the verrou source tree and a "valgrind-x.y.z" subdir. # 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. # But we actually need a valgrind source tree with a "verrou" subdir.
@ -60,7 +69,10 @@ def patch(self):
os.rmdir(valgrind_dir) os.rmdir(valgrind_dir)
# Once this is done, we can patch valgrind # 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 # Autogenerated perl path may be too long, need to fix this here
# because these files are used during the build. # because these files are used during the build.