diff options
| author | Jordan Galby <67924449+Jordan474@users.noreply.github.com> | 2023-05-22 17:28:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-22 10:28:57 -0500 |
| commit | 52ee1967d65c8a69902867fd7eb43af8132c20b9 (patch) | |
| tree | 9731f86bc78315b51d15f8c807b13f40c1ed85c2 /var/spack/repos/builtin/packages/llvm/package.py | |
| parent | 1af7284b5d3958414edff83cd7104cffbbe4c125 (diff) | |
| download | spack-52ee1967d65c8a69902867fd7eb43af8132c20b9.tar.gz spack-52ee1967d65c8a69902867fd7eb43af8132c20b9.tar.bz2 spack-52ee1967d65c8a69902867fd7eb43af8132c20b9.tar.xz spack-52ee1967d65c8a69902867fd7eb43af8132c20b9.zip | |
llvm: Fix hwloc@1 and hwloc@:2.3 compatibility (#35387)
Diffstat (limited to 'var/spack/repos/builtin/packages/llvm/package.py')
| -rw-r--r-- | var/spack/repos/builtin/packages/llvm/package.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/llvm/package.py b/var/spack/repos/builtin/packages/llvm/package.py index 83fc89fda2..1b17cbe7d0 100644 --- a/var/spack/repos/builtin/packages/llvm/package.py +++ b/var/spack/repos/builtin/packages/llvm/package.py @@ -236,7 +236,7 @@ class Llvm(CMakePackage, CudaPackage): # openmp dependencies depends_on("perl-data-dumper", type=("build")) depends_on("hwloc") - depends_on("hwloc@2.0.1:", when="@9:") + depends_on("hwloc@2.0.1:", when="@13") depends_on("elf", when="+cuda") # libomptarget depends_on("libffi", when="+libomptarget") # libomptarget @@ -375,6 +375,13 @@ class Llvm(CMakePackage, CudaPackage): # when/if the bugfix is merged patch("D133513.diff", level=0, when="@14:15+lldb+python") + # Fix hwloc@:2.3 (Conditionally disable hwloc@2.0 and hwloc@2.4 code) + patch( + "https://github.com/llvm/llvm-project/commit/3a362a9f38b95978160377ee408dbc7d14af9aad.patch?full_index=1", + sha256="25bc503f7855229620e56e76161cf4654945aef0be493a2d8d9e94a088157b7c", + when="@14:15", + ) + # The functions and attributes below implement external package # detection for LLVM. See: # |