diff options
| author | Massimiliano Culpo <massimiliano.culpo@gmail.com> | 2023-08-10 22:58:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-10 16:58:05 -0400 |
| commit | 9438cac219cc7ff127e03bc8a09dcb5d67124bb7 (patch) | |
| tree | c216dd94db083e7059e58ab03a2c61bce9be93e5 /var/spack/repos/builtin/packages/pika/package.py | |
| parent | 85cf66f65031e474946dcbd1821ecc8fd47073db (diff) | |
| download | spack-9438cac219cc7ff127e03bc8a09dcb5d67124bb7.tar.gz spack-9438cac219cc7ff127e03bc8a09dcb5d67124bb7.tar.bz2 spack-9438cac219cc7ff127e03bc8a09dcb5d67124bb7.tar.xz spack-9438cac219cc7ff127e03bc8a09dcb5d67124bb7.zip | |
Fix conflicts on direct dependencies that don't start with ^ (#39369)
Diffstat (limited to 'var/spack/repos/builtin/packages/pika/package.py')
| -rw-r--r-- | var/spack/repos/builtin/packages/pika/package.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/var/spack/repos/builtin/packages/pika/package.py b/var/spack/repos/builtin/packages/pika/package.py index 1e22d1ff5e..e129609c7e 100644 --- a/var/spack/repos/builtin/packages/pika/package.py +++ b/var/spack/repos/builtin/packages/pika/package.py @@ -92,8 +92,8 @@ class Pika(CMakePackage, CudaPackage, ROCmPackage): depends_on("boost@1.71:") depends_on("fmt@9:", when="@0.11:") # https://github.com/pika-org/pika/issues/686 - conflicts("fmt@10:", when="@:0.15 +cuda") - conflicts("fmt@10:", when="@:0.15 +rocm") + conflicts("^fmt@10:", when="@:0.15 +cuda") + conflicts("^fmt@10:", when="@:0.15 +rocm") depends_on("hwloc@1.11.5:") depends_on("gperftools", when="malloc=tcmalloc") @@ -110,7 +110,7 @@ class Pika(CMakePackage, CudaPackage, ROCmPackage): depends_on("rocblas", when="+rocm") depends_on("rocsolver", when="@0.5: +rocm") depends_on("tracy-client", when="+tracy") - conflicts("tracy-client@0.9:", when="@:0.9") + conflicts("^tracy-client@0.9:", when="@:0.9") depends_on("whip@0.1: +rocm", when="@0.9: +rocm") depends_on("whip@0.1: +cuda", when="@0.9: +cuda") |