diff options
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/doxygen/package.py | 3 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/dray/package.py | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/doxygen/package.py b/var/spack/repos/builtin/packages/doxygen/package.py index 9d3df0a12a..06b4900374 100644 --- a/var/spack/repos/builtin/packages/doxygen/package.py +++ b/var/spack/repos/builtin/packages/doxygen/package.py @@ -88,6 +88,9 @@ class Doxygen(CMakePackage): # Workaround for gcc getting stuck in an infinite loop patch('gcc-partial-inlining-bug.patch', when='@1.8.20: %gcc@7') + # Some GCC 7.x get stuck in an infinite loop + conflicts('%gcc@7.0:7.9', when='@1.9:') + def patch(self): if self.spec['iconv'].name == 'libc': return diff --git a/var/spack/repos/builtin/packages/dray/package.py b/var/spack/repos/builtin/packages/dray/package.py index 737e428579..a994e86d81 100644 --- a/var/spack/repos/builtin/packages/dray/package.py +++ b/var/spack/repos/builtin/packages/dray/package.py @@ -69,6 +69,7 @@ class Dray(Package, CudaPackage): depends_on("apcomp~shared~openmp~mpi", when="~shared~openmp~mpi") depends_on("apcomp+shared~openmp~mpi", when="+shared~openmp~mpi") + depends_on("raja@:0.13", when="@:0.1.6") depends_on("raja+cuda~openmp+shared", when="+cuda~openmp+shared") depends_on("raja+cuda+openmp+shared", when="+cuda+openmp+shared") depends_on("raja+cuda~openmp~shared", when="+cuda~openmp~shared") @@ -79,6 +80,7 @@ class Dray(Package, CudaPackage): depends_on("raja~cuda~openmp~shared", when="~cuda~openmp~shared") depends_on("raja~cuda+openmp~shared", when="~cuda+openmp~shared") + depends_on("umpire@:4.9", when="@:0.1.6") depends_on("umpire+cuda+shared", when="+cuda+shared") depends_on("umpire+cuda~shared", when="+cuda~shared") depends_on("umpire~cuda+shared", when="~cuda+shared") |