summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Cafarelli <voyageur@gentoo.org>2015-10-12 20:56:08 +0200
committerBernard Cafarelli <voyageur@gentoo.org>2015-10-12 20:58:12 +0200
commitb0c8f984e598c44cc0509df2ca00cc83280dfec8 (patch)
tree0fddaf7de856d2b4613bc8a4aaddab2e6a9aa2f7 /sys-devel/llvm
parentdev-lang/swi-prolog: remove old versions (diff)
downloadgentoo-b0c8f984e598c44cc0509df2ca00cc83280dfec8.tar.gz
gentoo-b0c8f984e598c44cc0509df2ca00cc83280dfec8.tar.bz2
gentoo-b0c8f984e598c44cc0509df2ca00cc83280dfec8.zip
sys-devel/llvm: fix lldb build against ncurses[tinfo], bug #560474
Package-Manager: portage-2.2.23
Diffstat (limited to 'sys-devel/llvm')
-rw-r--r--sys-devel/llvm/files/cmake/llvm-3.7.0-lldb_tinfo.patch12
-rw-r--r--sys-devel/llvm/llvm-3.7.0-r2.ebuild4
2 files changed, 16 insertions, 0 deletions
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 00000000000..c0f3a5ff3c8
--- /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 303ce9872f5..82c0d64b3db 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