diff options
| author | Massimiliano Culpo <massimiliano.culpo@gmail.com> | 2024-02-07 16:52:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-07 16:52:26 +0100 |
| commit | b0f3489d681d30beee4a9276bb9618aacf841bb3 (patch) | |
| tree | efc052dd298cc81a44c2cdf8b59b24027a277f8f | |
| parent | 9099e4c233726716a8fb8d6e9e2f976128bea699 (diff) | |
| download | spack-b0f3489d681d30beee4a9276bb9618aacf841bb3.tar.gz spack-b0f3489d681d30beee4a9276bb9618aacf841bb3.tar.bz2 spack-b0f3489d681d30beee4a9276bb9618aacf841bb3.tar.xz spack-b0f3489d681d30beee4a9276bb9618aacf841bb3.zip | |
py-*: fix self-referential dependencies (#42548)
3 files changed, 5 insertions, 3 deletions
diff --git a/var/spack/repos/builtin/packages/py-imagecodecs/package.py b/var/spack/repos/builtin/packages/py-imagecodecs/package.py index 86360d53d1..bd425abe9b 100644 --- a/var/spack/repos/builtin/packages/py-imagecodecs/package.py +++ b/var/spack/repos/builtin/packages/py-imagecodecs/package.py @@ -45,7 +45,7 @@ class PyImagecodecs(PythonPackage): depends_on("openjpeg@2.4.0:") depends_on("snappy@1.1.9:") depends_on("zlib-api") - depends_on("zlib@1.2.11:", when="^zlib") + depends_on("zlib@1.2.11:", when="^[virtuals=zlib-api] zlib") depends_on("zopfli@1.0.3: +shared") depends_on("zstd@1.5.2:") diff --git a/var/spack/repos/builtin/packages/py-py-spy/package.py b/var/spack/repos/builtin/packages/py-py-spy/package.py index 4c588a79bf..c150d6e947 100644 --- a/var/spack/repos/builtin/packages/py-py-spy/package.py +++ b/var/spack/repos/builtin/packages/py-py-spy/package.py @@ -22,7 +22,7 @@ class PyPySpy(Package): # CargoPackage base class. depends_on("rust", type="build") depends_on("unwind") - depends_on("libunwind components=ptrace", when="^libunwind") + depends_on("libunwind components=ptrace", when="^[virtuals=unwind] libunwind") def install(self, spec, prefix): cargo = which("cargo") diff --git a/var/spack/repos/builtin/packages/py-topiary-asr/package.py b/var/spack/repos/builtin/packages/py-topiary-asr/package.py index 29181dd768..c56160f9ad 100644 --- a/var/spack/repos/builtin/packages/py-topiary-asr/package.py +++ b/var/spack/repos/builtin/packages/py-topiary-asr/package.py @@ -47,7 +47,9 @@ class PyTopiaryAsr(PythonPackage): depends_on("raxml-ng@1.1:", type="run") depends_on("mpi", type="run") - depends_on("openmpi+legacylaunchers", type="run", when="^openmpi schedulers=slurm") + depends_on( + "openmpi+legacylaunchers", type="run", when="^[virtuals=mpi] openmpi schedulers=slurm" + ) conflicts("^mpich") |