Re: [Lldb-commits] [PATCH] D12672: add a dependency on terminfo library if llvm uses it
zturner closed this revision. zturner added a comment. Sorry this took so long, I forgot about it. It has been committed in r247842. http://reviews.llvm.org/D12672 ___ lldb-commits mailing list lldb-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
Re: [Lldb-commits] [PATCH] D12672: add a dependency on terminfo library if llvm uses it
jeremi.piotrowski added a comment. I do not have commit access, so if you could do it for me that would be great. http://reviews.llvm.org/D12672 ___ lldb-commits mailing list lldb-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
Re: [Lldb-commits] [PATCH] D12672: add a dependency on terminfo library if llvm uses it
Looks fine, do you have commit access? If so feel free to commit
whenever. Otherwise I can do it for you tomorrow
On Mon, Sep 7, 2015 at 1:15 PM Jeremi Piotrowski <
jeremi.piotrow...@gmail.com> wrote:
> jeremi.piotrowski updated this revision to Diff 34169.
> jeremi.piotrowski added a comment.
>
> - combine nested if conditions with `and` as suggested by zturner
>
> and remove condtition from `endif` as that seems to be the convention.
>
>
> http://reviews.llvm.org/D12672
>
> Files:
> cmake/LLDBDependencies.cmake
>
> Index: cmake/LLDBDependencies.cmake
> ===
> --- cmake/LLDBDependencies.cmake
> +++ cmake/LLDBDependencies.cmake
> @@ -146,6 +146,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.
>
>
>
___
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
Re: [Lldb-commits] [PATCH] D12672: add a dependency on terminfo library if llvm uses it
zturner added a comment. Looks fine, do you have commit access? If so feel free to commit whenever. Otherwise I can do it for you tomorrow http://reviews.llvm.org/D12672 ___ lldb-commits mailing list lldb-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
Re: [Lldb-commits] [PATCH] D12672: add a dependency on terminfo library if llvm uses it
jeremi.piotrowski updated this revision to Diff 34169.
jeremi.piotrowski added a comment.
- combine nested if conditions with `and` as suggested by zturner
and remove condtition from `endif` as that seems to be the convention.
http://reviews.llvm.org/D12672
Files:
cmake/LLDBDependencies.cmake
Index: cmake/LLDBDependencies.cmake
===
--- cmake/LLDBDependencies.cmake
+++ cmake/LLDBDependencies.cmake
@@ -146,6 +146,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.
Index: cmake/LLDBDependencies.cmake
===
--- cmake/LLDBDependencies.cmake
+++ cmake/LLDBDependencies.cmake
@@ -146,6 +146,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.
___
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
Re: [Lldb-commits] [PATCH] D12672: add a dependency on terminfo library if llvm uses it
zturner added a subscriber: zturner. zturner added a comment. Looks fine to me, but as a nitpick, I would suggest combining the nested if into a single if with an AND clause. http://reviews.llvm.org/D12672 ___ lldb-commits mailing list lldb-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
[Lldb-commits] [PATCH] D12672: add a dependency on terminfo library if llvm uses it
jeremi.piotrowski created this revision.
jeremi.piotrowski added a subscriber: lldb-commits.
Ncurses related symbols can either all be found in libnurses or split between
libncurses and libtinfo. The main LLVM cmake scripts look for the setupterm
symbol and stores the library that has it in TERMINFO_LIBS. This covers the
split and unified ncurses case. LLDB uses symbols that can end up in libtinfo so
this library should be pulled in if it is found.
There is still an exotic case left where LLDB is configured with
-DLLDB_DISABLE_CURSES=NO and LLVM with -DLLVM_ENABLE_TERMINFO=NO but
misconfigurations will always be possible. Possibly a diagnostic could be added
for that.
This fixes bug 24693 (https://llvm.org/bugs/show_bug.cgi?id=24693).
http://reviews.llvm.org/D12672
Files:
cmake/LLDBDependencies.cmake
Index: cmake/LLDBDependencies.cmake
===
--- cmake/LLDBDependencies.cmake
+++ cmake/LLDBDependencies.cmake
@@ -146,6 +146,11 @@
endif()
if (NOT LLDB_DISABLE_CURSES)
list(APPEND LLDB_SYSTEM_LIBS panel ncurses)
+if(LLVM_ENABLE_TERMINFO)
+ if(HAVE_TERMINFO)
+ list(APPEND LLDB_SYSTEM_LIBS ${TERMINFO_LIBS})
+ endif(HAVE_TERMINFO)
+endif(LLVM_ENABLE_TERMINFO)
endif()
endif()
# On FreeBSD backtrace() is provided by libexecinfo, not libc.
Index: cmake/LLDBDependencies.cmake
===
--- cmake/LLDBDependencies.cmake
+++ cmake/LLDBDependencies.cmake
@@ -146,6 +146,11 @@
endif()
if (NOT LLDB_DISABLE_CURSES)
list(APPEND LLDB_SYSTEM_LIBS panel ncurses)
+if(LLVM_ENABLE_TERMINFO)
+ if(HAVE_TERMINFO)
+ list(APPEND LLDB_SYSTEM_LIBS ${TERMINFO_LIBS})
+ endif(HAVE_TERMINFO)
+endif(LLVM_ENABLE_TERMINFO)
endif()
endif()
# On FreeBSD backtrace() is provided by libexecinfo, not libc.
___
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
