diff options
| author | Denis Davydov <davydden@gmail.com> | 2016-12-13 10:32:42 +0100 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2016-12-13 01:32:42 -0800 |
| commit | fab9af708117d5c681d2a5f4f752c10568ecd714 (patch) | |
| tree | 9ca5ba7267e5ecd7d4758d998433b671baa5a42e /var | |
| parent | 8496d8ff778e9c7dfb4dcb5557e8cfad36124620 (diff) | |
| download | spack-fab9af708117d5c681d2a5f4f752c10568ecd714.tar.gz spack-fab9af708117d5c681d2a5f4f752c10568ecd714.tar.bz2 spack-fab9af708117d5c681d2a5f4f752c10568ecd714.tar.xz spack-fab9af708117d5c681d2a5f4f752c10568ecd714.zip | |
slepc/petsc: fix python dependency (#2560)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/petsc/package.py | 6 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/slepc/package.py | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/var/spack/repos/builtin/packages/petsc/package.py b/var/spack/repos/builtin/packages/petsc/package.py index 82b639313a..578349cbc4 100644 --- a/var/spack/repos/builtin/packages/petsc/package.py +++ b/var/spack/repos/builtin/packages/petsc/package.py @@ -40,7 +40,7 @@ class Petsc(Package): version('develop', git='https://bitbucket.org/petsc/petsc.git', tag='master') version('for-pflotran-0.1.0', git='https://bitbucket.org/petsc/petsc.git', commit='7943f4e1472fff9cf1fc630a1100136616e4970f') - + version('3.7.4', 'aaf94fa54ef83022c14091f10866eedf') version('3.7.2', '50da49867ce7a49e7a0c1b37f4ec7b34') version('3.6.4', '7632da2375a3df35b8891c9526dbdde7') @@ -79,7 +79,7 @@ class Petsc(Package): depends_on('mpi', when='+mpi') # Build dependencies - depends_on('python @2.6:2.7') + depends_on('python @2.6:2.7', type='build') # Other dependencies depends_on('boost', when='@:3.5+boost') @@ -94,7 +94,7 @@ class Petsc(Package): depends_on('hypre~internal-superlu', when='+hypre+mpi~complex') depends_on('superlu-dist@:4.3', when='@3.4.4:3.6.4+superlu-dist+mpi') depends_on('superlu-dist@5.0.0:', when='@3.7:+superlu-dist+mpi') - depends_on('superlu-dist@5.0.0:', when='@for-pflotran-0.1.0+superlu-dist+mpi') + depends_on('superlu-dist@5.0.0:', when='@for-pflotran-0.1.0+superlu-dist+mpi') depends_on('mumps+mpi', when='+mumps+mpi') depends_on('scalapack', when='+mumps+mpi') diff --git a/var/spack/repos/builtin/packages/slepc/package.py b/var/spack/repos/builtin/packages/slepc/package.py index e208400eea..17c512119c 100644 --- a/var/spack/repos/builtin/packages/slepc/package.py +++ b/var/spack/repos/builtin/packages/slepc/package.py @@ -41,6 +41,8 @@ class Slepc(Package): variant('arpack', default=True, description='Enables Arpack wrappers') + # NOTE: make sure PETSc and SLEPc use the same python. + depends_on('python@2.6:2.7', type='build') depends_on('petsc@3.7:', when='@3.7.1:') depends_on('petsc@3.6.3:3.6.4', when='@3.6.2:3.6.3') depends_on('arpack-ng~mpi', when='+arpack^petsc~mpi') |