commit:     b0c8f984e598c44cc0509df2ca00cc83280dfec8
Author:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 12 18:56:08 2015 +0000
Commit:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Mon Oct 12 18:58:12 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0c8f984

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

Package-Manager: portage-2.2.23

 sys-devel/llvm/files/cmake/llvm-3.7.0-lldb_tinfo.patch | 12 ++++++++++++
 sys-devel/llvm/llvm-3.7.0-r2.ebuild                    |  4 ++++
 2 files changed, 16 insertions(+)

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
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 303ce98..82c0d64 100644
--- 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

Reply via email to