zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

llvm: fix ncurses/terminfo builds (#32028)

Browse Source 
* llvm: fix ncurses/terminfo builds

* use suggestion

* formatting
This commit is contained in:
Andrew W Elble 2022-08-15 17:37:59 -04:00 committed by GitHub
parent 713c716195
commit ce0683db1d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
var/spack/repos/builtin/packages/llvm/package.py
View File

@ -574,7 +574,6 @@ def cmake_args(self):
define("LLVM_REQUIRES_RTTI", True), define("LLVM_REQUIRES_RTTI", True),
define("LLVM_ENABLE_RTTI", True), define("LLVM_ENABLE_RTTI", True),
define("LLVM_ENABLE_EH", True), define("LLVM_ENABLE_EH", True),
define("LLVM_ENABLE_TERMINFO", False),
define("LLVM_ENABLE_LIBXML2", False), define("LLVM_ENABLE_LIBXML2", False),
define("CLANG_DEFAULT_OPENMP_RUNTIME", "libomp"), define("CLANG_DEFAULT_OPENMP_RUNTIME", "libomp"),
define("PYTHON_EXECUTABLE", python.command.path), define("PYTHON_EXECUTABLE", python.command.path),
@ -639,6 +638,10 @@ def cmake_args(self):
projects.append("lldb") projects.append("lldb")
cmake_args.append(define("LLDB_ENABLE_LIBEDIT", True)) cmake_args.append(define("LLDB_ENABLE_LIBEDIT", True))
cmake_args.append(define("LLDB_ENABLE_CURSES", 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)) cmake_args.append(define("LLDB_ENABLE_LIBXML2", False))
if spec.version >= Version("10"): if spec.version >= Version("10"):
cmake_args.append(from_variant("LLDB_ENABLE_PYTHON", "python")) cmake_args.append(from_variant("LLDB_ENABLE_PYTHON", "python"))
@ -646,6 +649,8 @@ def cmake_args(self):
cmake_args.append(define("LLDB_DISABLE_PYTHON", "~python" in spec)) cmake_args.append(define("LLDB_DISABLE_PYTHON", "~python" in spec))
if spec.satisfies("@5.0.0: +python"): if spec.satisfies("@5.0.0: +python"):
cmake_args.append(define("LLDB_USE_SYSTEM_SIX", True)) cmake_args.append(define("LLDB_USE_SYSTEM_SIX", True))
else:
cmake_args.append(define("LLVM_ENABLE_TERMINFO", False))
if "+gold" in spec: if "+gold" in spec:
cmake_args.append(define("LLVM_BINUTILS_INCDIR", spec["binutils"].prefix.include)) cmake_args.append(define("LLVM_BINUTILS_INCDIR", spec["binutils"].prefix.include))