summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--var/spack/repos/builtin/packages/llvm/package.py14
1 files changed, 10 insertions, 4 deletions
diff --git a/var/spack/repos/builtin/packages/llvm/package.py b/var/spack/repos/builtin/packages/llvm/package.py
index deed68dfa9..3e2c55712c 100644
--- a/var/spack/repos/builtin/packages/llvm/package.py
+++ b/var/spack/repos/builtin/packages/llvm/package.py
@@ -56,6 +56,7 @@ class Llvm(CMakePackage, CudaPackage, LlvmDetection, CompilerPackage):
license("Apache-2.0")
version("main", branch="main")
+ version("19.1.0", sha256="0a08341036ca99a106786f50f9c5cb3fbe458b3b74cab6089fd368d0edb2edfe")
version("18.1.8", sha256="09c08693a9afd6236f27a2ebae62cda656eba19021ef3f94d59e931d662d4856")
version("18.1.7", sha256="b60df7cbe02cef2523f7357120fb0d46cbb443791cde3a5fb36b82c335c0afc9")
version("18.1.6", sha256="01390edfae5b809e982b530ff9088e674c62b13aa92cb9dc1e067fa2cf501083")
@@ -287,6 +288,8 @@ class Llvm(CMakePackage, CudaPackage, LlvmDetection, CompilerPackage):
description="Enable zstd support for static analyzer / lld",
)
+ provides("libllvm@19", when="@19.0.0:19")
+ provides("libllvm@18", when="@18.0.0:18")
provides("libllvm@17", when="@17.0.0:17")
provides("libllvm@16", when="@16.0.0:16")
provides("libllvm@15", when="@15.0.0:15")
@@ -896,17 +899,20 @@ class Llvm(CMakePackage, CudaPackage, LlvmDetection, CompilerPackage):
define("LLDB_ENABLE_LZMA", True),
]
)
- if spec["ncurses"].satisfies("+termlib"):
- cmake_args.append(define("LLVM_ENABLE_TERMINFO", True))
+ if spec.satisfies("@19:"):
+ cmake_args.append(define("LLDB_CURSES_LIBS", spec["ncurses"].libs))
else:
- cmake_args.append(define("LLVM_ENABLE_TERMINFO", False))
+ if spec["ncurses"].satisfies("+termlib"):
+ cmake_args.append(define("LLVM_ENABLE_TERMINFO", True))
+ else:
+ cmake_args.append(define("LLVM_ENABLE_TERMINFO", False))
if spec.version >= Version("10"):
cmake_args.append(from_variant("LLDB_ENABLE_PYTHON", "python"))
else:
cmake_args.append(define("LLDB_DISABLE_PYTHON", "~python" in spec))
if spec.satisfies("@5.0.0: +python"):
cmake_args.append(define("LLDB_USE_SYSTEM_SIX", True))
- else:
+ elif spec.satisfies("@:19"):
cmake_args.append(define("LLVM_ENABLE_TERMINFO", False))
if "+gold" in spec: