diff options
| -rw-r--r-- | var/spack/repos/builtin/packages/dealii/package.py | 1 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/piranha/package.py | 4 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/trilinos/package.py | 3 |
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') |