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

dealii, piranha, trilinos: remove mentions of non-existing variants (#20406)

Browse Source
This commit is contained in:
Massimiliano Culpo 2020-12-15 17:44:20 +01:00 committed by GitHub
parent 21f30e3074
commit 7501d9d150
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
var/spack/repos/builtin/packages/dealii/package.py
View File

@ -219,7 +219,6 @@ class Dealii(CMakePackage, CudaPackage):
when='@9.0.0:9.1.1') when='@9.0.0:9.1.1')
# Check for sufficiently modern versions # Check for sufficiently modern versions
conflicts('cxxstd=98', when='@9.0:')
conflicts('cxxstd=11', when='@9.3:') conflicts('cxxstd=11', when='@9.3:')
# Interfaces added in 8.5.0: # Interfaces added in 8.5.0:

4
var/spack/repos/builtin/packages/piranha/package.py
View File

@ -23,8 +23,8 @@ class Piranha(CMakePackage):
# Build dependencies # Build dependencies
depends_on('cmake@3.2.0:', type='build') depends_on('cmake@3.2.0:', type='build')
extends('python', when='+pyranha') extends('python', when='+python')
depends_on('python@2.6:', type='build', when='+pyranha') depends_on('python@2.6:', type='build', when='+python')
# Other dependencies # Other dependencies
depends_on('boost+iostreams+regex+serialization', depends_on('boost+iostreams+regex+serialization',

3
var/spack/repos/builtin/packages/trilinos/package.py
View File

@ -271,7 +271,6 @@ class Trilinos(CMakePackage, CudaPackage):
conflicts('+isorropia', when='~teuchos') conflicts('+isorropia', when='~teuchos')
conflicts('+isorropia', when='~zoltan') conflicts('+isorropia', when='~zoltan')
conflicts('+muelu', when='~teuchos') conflicts('+muelu', when='~teuchos')
conflicts('+muelu', when='~xpetra')
conflicts('+nox', when='~teuchos') conflicts('+nox', when='~teuchos')
conflicts('+phalanx', when='~kokkos') conflicts('+phalanx', when='~kokkos')
conflicts('+phalanx', when='~sacado') conflicts('+phalanx', when='~sacado')
@ -292,7 +291,6 @@ class Trilinos(CMakePackage, CudaPackage):
conflicts('+tpetra', when='~teuchos') conflicts('+tpetra', when='~teuchos')
conflicts('+zoltan2', when='~teuchos') conflicts('+zoltan2', when='~teuchos')
conflicts('+zoltan2', when='~tpetra') conflicts('+zoltan2', when='~tpetra')
conflicts('+zoltan2', when='~xpetra')
conflicts('+zoltan2', when='~zoltan') conflicts('+zoltan2', when='~zoltan')
conflicts('+dtk', when='~boost') conflicts('+dtk', when='~boost')
@ -398,7 +396,6 @@ class Trilinos(CMakePackage, CudaPackage):
# Dependencies/conflicts when MPI is disabled # Dependencies/conflicts when MPI is disabled
depends_on('hdf5~mpi', when='+hdf5~mpi') depends_on('hdf5~mpi', when='+hdf5~mpi')
conflicts('+parmetis', when='~mpi')
conflicts('+pnetcdf', when='~mpi') conflicts('+pnetcdf', when='~mpi')
patch('umfpack_from_suitesparse.patch', when='@11.14.1:12.8.1') patch('umfpack_from_suitesparse.patch', when='@11.14.1:12.8.1')