summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMassimiliano Culpo <massimiliano.culpo@gmail.com>2020-12-15 17:44:20 +0100
committerGitHub <noreply@github.com>2020-12-15 17:44:20 +0100
commit7501d9d150b0a58643dcef0edc7606a225f654a9 (patch)
tree7fb17d67c4afd354030799220a57813daf788d52
parent21f30e3074f2a23f4fa945a658cec3fecb979938 (diff)
downloadspack-7501d9d150b0a58643dcef0edc7606a225f654a9.tar.gz
spack-7501d9d150b0a58643dcef0edc7606a225f654a9.tar.bz2
spack-7501d9d150b0a58643dcef0edc7606a225f654a9.tar.xz
spack-7501d9d150b0a58643dcef0edc7606a225f654a9.zip
dealii, piranha, trilinos: remove mentions of non-existing variants (#20406)
-rw-r--r--var/spack/repos/builtin/packages/dealii/package.py1
-rw-r--r--var/spack/repos/builtin/packages/piranha/package.py4
-rw-r--r--var/spack/repos/builtin/packages/trilinos/package.py3
3 files changed, 2 insertions, 6 deletions
diff --git a/var/spack/repos/builtin/packages/dealii/package.py b/var/spack/repos/builtin/packages/dealii/package.py
index d8a225daba..747a0743be 100644
--- a/var/spack/repos/builtin/packages/dealii/package.py
+++ b/var/spack/repos/builtin/packages/dealii/package.py
@@ -219,7 +219,6 @@ class Dealii(CMakePackage, CudaPackage):
when='@9.0.0:9.1.1')
# Check for sufficiently modern versions
- conflicts('cxxstd=98', when='@9.0:')
conflicts('cxxstd=11', when='@9.3:')
# Interfaces added in 8.5.0:
diff --git a/var/spack/repos/builtin/packages/piranha/package.py b/var/spack/repos/builtin/packages/piranha/package.py
index c8681c1607..4a21bf77b2 100644
--- a/var/spack/repos/builtin/packages/piranha/package.py
+++ b/var/spack/repos/builtin/packages/piranha/package.py
@@ -23,8 +23,8 @@ class Piranha(CMakePackage):
# Build dependencies
depends_on('cmake@3.2.0:', type='build')
- extends('python', when='+pyranha')
- depends_on('python@2.6:', type='build', when='+pyranha')
+ extends('python', when='+python')
+ depends_on('python@2.6:', type='build', when='+python')
# Other dependencies
depends_on('boost+iostreams+regex+serialization',
diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py
index 50227fec2a..1623e1c16b 100644
--- a/var/spack/repos/builtin/packages/trilinos/package.py
+++ b/var/spack/repos/builtin/packages/trilinos/package.py
@@ -271,7 +271,6 @@ class Trilinos(CMakePackage, CudaPackage):
conflicts('+isorropia', when='~teuchos')
conflicts('+isorropia', when='~zoltan')
conflicts('+muelu', when='~teuchos')
- conflicts('+muelu', when='~xpetra')
conflicts('+nox', when='~teuchos')
conflicts('+phalanx', when='~kokkos')
conflicts('+phalanx', when='~sacado')
@@ -292,7 +291,6 @@ class Trilinos(CMakePackage, CudaPackage):
conflicts('+tpetra', when='~teuchos')
conflicts('+zoltan2', when='~teuchos')
conflicts('+zoltan2', when='~tpetra')
- conflicts('+zoltan2', when='~xpetra')
conflicts('+zoltan2', when='~zoltan')
conflicts('+dtk', when='~boost')
@@ -398,7 +396,6 @@ class Trilinos(CMakePackage, CudaPackage):
# Dependencies/conflicts when MPI is disabled
depends_on('hdf5~mpi', when='+hdf5~mpi')
- conflicts('+parmetis', when='~mpi')
conflicts('+pnetcdf', when='~mpi')
patch('umfpack_from_suitesparse.patch', when='@11.14.1:12.8.1')