diff options
| author | Tiziano Müller <tiziano.mueller@chem.uzh.ch> | 2020-11-02 14:39:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-02 07:39:21 -0600 |
| commit | acc075d79d009bfa1e9b1a67a4a559c9fa9772e3 (patch) | |
| tree | fab76fdbfadf0385dd5fd617ace1da42a6cd8b19 | |
| parent | 4fe56de72ebfe09b81419663064331fb5770aab0 (diff) | |
| download | spack-acc075d79d009bfa1e9b1a67a4a559c9fa9772e3.tar.gz spack-acc075d79d009bfa1e9b1a67a4a559c9fa9772e3.tar.bz2 spack-acc075d79d009bfa1e9b1a67a4a559c9fa9772e3.tar.xz spack-acc075d79d009bfa1e9b1a67a4a559c9fa9772e3.zip | |
llvm: fix +lldb build with external ncurses on openSUSE (#19627)
fixes #19625
| -rw-r--r-- | var/spack/repos/builtin/packages/llvm/lldb_external_ncurses-10.patch | 31 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/llvm/package.py | 4 |
2 files changed, 35 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/llvm/lldb_external_ncurses-10.patch b/var/spack/repos/builtin/packages/llvm/lldb_external_ncurses-10.patch new file mode 100644 index 0000000000..34ed0e3cd2 --- /dev/null +++ b/var/spack/repos/builtin/packages/llvm/lldb_external_ncurses-10.patch @@ -0,0 +1,31 @@ +diff --git a/lldb/include/lldb/Host/Config.h.cmake b/lldb/include/lldb/Host/Config.h.cmake +--- a/lldb/include/lldb/Host/Config.h.cmake ++++ b/lldb/include/lldb/Host/Config.h.cmake +@@ -38,6 +38,8 @@ + + #cmakedefine01 LLDB_ENABLE_CURSES + ++#cmakedefine01 CURSES_HAVE_NCURSES_CURSES_H ++ + #cmakedefine01 LLDB_ENABLE_LIBEDIT + + #cmakedefine01 LLDB_ENABLE_LIBXML2 +diff --git a/lldb/source/Core/IOHandlerCursesGUI.cpp b/lldb/source/Core/IOHandlerCursesGUI.cpp +--- a/lldb/source/Core/IOHandlerCursesGUI.cpp ++++ b/lldb/source/Core/IOHandlerCursesGUI.cpp +@@ -10,9 +10,14 @@ + #include "lldb/Host/Config.h" + + #if LLDB_ENABLE_CURSES ++#if CURSES_HAVE_NCURSES_CURSES_H ++#include <ncurses/curses.h> ++#include <ncurses/panel.h> ++#else + #include <curses.h> + #include <panel.h> + #endif ++#endif + + #if defined(__APPLE__) + #include <deque> + diff --git a/var/spack/repos/builtin/packages/llvm/package.py b/var/spack/repos/builtin/packages/llvm/package.py index b87d6b92e3..3d4bfe8d53 100644 --- a/var/spack/repos/builtin/packages/llvm/package.py +++ b/var/spack/repos/builtin/packages/llvm/package.py @@ -208,6 +208,10 @@ class Llvm(CMakePackage, CudaPackage): # https://bugs.llvm.org/show_bug.cgi?id=39696 patch("thread-p9.patch", when="@develop+libcxx") + # https://github.com/spack/spack/issues/19625, + # merged in llvm-11.0.0_rc2 + patch("lldb_external_ncurses-10.patch", when="@10.0.0:10.99+lldb") + # The functions and attributes below implement external package # detection for LLVM. See: # |