diff options
| author | Andrew W Elble <aweits@rit.edu> | 2022-08-15 17:37:59 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-15 15:37:59 -0600 |
| commit | ce0683db1d40a3fa991b8b0628cbce34c38f0318 (patch) | |
| tree | 1f4fc5383eca3f3e54ba03e797d5c21536ad26eb /var | |
| parent | 713c7161957103158dbc508b2662b29191a2d85f (diff) | |
| download | spack-ce0683db1d40a3fa991b8b0628cbce34c38f0318.tar.gz spack-ce0683db1d40a3fa991b8b0628cbce34c38f0318.tar.bz2 spack-ce0683db1d40a3fa991b8b0628cbce34c38f0318.tar.xz spack-ce0683db1d40a3fa991b8b0628cbce34c38f0318.zip | |
llvm: fix ncurses/terminfo builds (#32028)
* llvm: fix ncurses/terminfo builds
* use suggestion
* formatting
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/llvm/package.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/llvm/package.py b/var/spack/repos/builtin/packages/llvm/package.py index fefeabbb51..6d7aa67697 100644 --- a/var/spack/repos/builtin/packages/llvm/package.py +++ b/var/spack/repos/builtin/packages/llvm/package.py @@ -574,7 +574,6 @@ class Llvm(CMakePackage, CudaPackage): define("LLVM_REQUIRES_RTTI", True), define("LLVM_ENABLE_RTTI", True), define("LLVM_ENABLE_EH", True), - define("LLVM_ENABLE_TERMINFO", False), define("LLVM_ENABLE_LIBXML2", False), define("CLANG_DEFAULT_OPENMP_RUNTIME", "libomp"), define("PYTHON_EXECUTABLE", python.command.path), @@ -639,6 +638,10 @@ class Llvm(CMakePackage, CudaPackage): projects.append("lldb") cmake_args.append(define("LLDB_ENABLE_LIBEDIT", True)) cmake_args.append(define("LLDB_ENABLE_CURSES", True)) + if spec["ncurses"].satisfies("+termlib"): + cmake_args.append(define("LLVM_ENABLE_TERMINFO", True)) + else: + cmake_args.append(define("LLVM_ENABLE_TERMINFO", False)) cmake_args.append(define("LLDB_ENABLE_LIBXML2", False)) if spec.version >= Version("10"): cmake_args.append(from_variant("LLDB_ENABLE_PYTHON", "python")) @@ -646,6 +649,8 @@ class Llvm(CMakePackage, CudaPackage): 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: + cmake_args.append(define("LLVM_ENABLE_TERMINFO", False)) if "+gold" in spec: cmake_args.append(define("LLVM_BINUTILS_INCDIR", spec["binutils"].prefix.include)) |