sys-devel/llvm: fix lldb build against ncurses[tinfo], bug #560474

Package-Manager: portage-2.2.23

diff --git a/sys-devel/llvm/files/cmake/llvm-3.7.0-lldb_tinfo.patch b/sys-devel/llvm/files/cmake/llvm-3.7.0-lldb_tinfo.patch
new file mode 100644 (file)
index 0000000..c0f3a5f
--- /dev/null
+++ b/sys-devel/llvm/files/cmake/llvm-3.7.0-lldb_tinfo.patch
@@ -0,0 +1,12 @@
+--- tools/lldb/cmake/LLDBDependencies.cmake    2015/09/16 20:13:53     247841
++++ tools/lldb/cmake/LLDBDependencies.cmake    2015/09/16 20:14:01     247842
+@@ -141,6 +141,9 @@
+   endif()
+   if (NOT LLDB_DISABLE_CURSES)
+     list(APPEND LLDB_SYSTEM_LIBS panel ncurses)
++    if(LLVM_ENABLE_TERMINFO AND HAVE_TERMINFO)
++      list(APPEND LLDB_SYSTEM_LIBS ${TERMINFO_LIBS})
++    endif()
+   endif()
+ endif()
+ # On FreeBSD backtrace() is provided by libexecinfo, not libc.

diff --git a/sys-devel/llvm/llvm-3.7.0-r2.ebuild b/sys-devel/llvm/llvm-3.7.0-r2.ebuild
index 303ce9872f50c1ecc1411516b4b7c2fa0d03cb17..82c0d64b3db878058983487e34e76060d7344a03 100644 (file)
--- a/sys-devel/llvm/llvm-3.7.0-r2.ebuild
+++ b/sys-devel/llvm/llvm-3.7.0-r2.ebuild
@@ -202,6 +202,10 @@ src_prepare() {
                epatch "${FILESDIR}"/${PN}-3.7-lldb_python.patch
                sed -e "s/GENTOO_LIBDIR/$(get_libdir)/" \
                        -i tools/lldb/scripts/Python/finishSwigPythonLLDB.py || die
+
+               # Fix build with ncurses[tinfo], #560474
+               # http://llvm.org/viewvc/llvm-project?view=revision&revision=247842
+               epatch "${FILESDIR}"/cmake/${P}-lldb_tinfo.patch
        fi
 
        # User patches