Fri Apr 26 20:07:15 2024 UTC (15d)
lldb: don't try to outsmart pkgsrc's curses & terminfo logic

Probably this was an attempt to paper over the bug fixed in
termcap.builtin.mk the other day. Likely cause of PR pkg/58045.


(tnn)
diff -r1.1 -r1.2 pkgsrc/devel/lldb/options.mk
cvs diff -r1.1 -r1.2 pkgsrc/devel/lldb/options.mk (expand / switch to unified diff)

--- pkgsrc/devel/lldb/options.mk 2023/10/06 19:16:28 1.1
+++ pkgsrc/devel/lldb/options.mk 2024/04/26 20:07:15 1.2
@@ -1,49 +1,25 @@ @@ -1,49 +1,25 @@
1# $NetBSD: options.mk,v 1.1 2023/10/06 19:16:28 adam Exp $ 1# $NetBSD: options.mk,v 1.2 2024/04/26 20:07:15 tnn Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.lldb 3PKG_OPTIONS_VAR= PKG_OPTIONS.lldb
4 4
5PKG_SUPPORTED_OPTIONS+= tests curses 5PKG_SUPPORTED_OPTIONS+= tests curses
6PKG_SUGGESTED_OPTIONS= curses 6PKG_SUGGESTED_OPTIONS= curses
7 7
8.include "../../mk/bsd.options.mk" 8.include "../../mk/bsd.options.mk"
9 9
10.if ${PKG_OPTIONS:Mtests} 10.if ${PKG_OPTIONS:Mtests}
11CMAKE_ARGS+= -DLLVM_INCLUDE_TESTS=ON 11CMAKE_ARGS+= -DLLVM_INCLUDE_TESTS=ON
12.else 12.else
13# py-lit, py-psutil, lld 13# py-lit, py-psutil, lld
14CMAKE_ARGS+= -DLLVM_INCLUDE_TESTS=OFF 14CMAKE_ARGS+= -DLLVM_INCLUDE_TESTS=OFF
15.endif 15.endif
16 16
17.if ${PKG_OPTIONS:Mcurses} 17.if ${PKG_OPTIONS:Mcurses}
18.include "../../mk/curses.buildlink3.mk" 18.include "../../mk/curses.buildlink3.mk"
19 19.include "../../mk/terminfo.buildlink3.mk"
20. if ${OPSYS} == "NetBSD" 
21. if exists(/usr/include/panel.h) 
22CMAKE_ARGS+= -DLLDB_ENABLE_CURSES=ON 20CMAKE_ARGS+= -DLLDB_ENABLE_CURSES=ON
23CMAKE_ARGS+= -DLLVM_ENABLE_TERMINFO=ON 21CMAKE_ARGS+= -DLLVM_ENABLE_TERMINFO=ON
24. else 
25.include "../../devel/ncurses/buildlink3.mk" 
26. if exists(${BUILDLINK_PREFIX.ncurses}/include/ncurses/panel.h) 
27CMAKE_ARGS+= -DLLDB_ENABLE_CURSES=ON 
28CMAKE_ARGS+= -DLLVM_ENABLE_TERMINFO=ON 
29. else 
30CMAKE_ARGS+= -DLLDB_ENABLE_CURSES=OFF 
31CMAKE_ARGS+= -DLLVM_ENABLE_TERMINFO=OFF 
32. endif 
33. endif 
34. else 
35.include "../../devel/ncurses/buildlink3.mk" 
36. if exists(${BUILDLINK_PREFIX.ncurses}/include/ncurses/panel.h) 
37CMAKE_ARGS+= -DLLDB_ENABLE_CURSES=ON 
38CMAKE_ARGS+= -DLLVM_ENABLE_TERMINFO=ON 
39. else 
40CMAKE_ARGS+= -DLLDB_ENABLE_CURSES=OFF 
41CMAKE_ARGS+= -DLLVM_ENABLE_TERMINFO=OFF 
42. endif 
43. endif 
44 
45.else 22.else
46 
47CMAKE_ARGS+= -DLLDB_ENABLE_CURSES=OFF 23CMAKE_ARGS+= -DLLDB_ENABLE_CURSES=OFF
48CMAKE_ARGS+= -DLLVM_ENABLE_TERMINFO=OFF 24CMAKE_ARGS+= -DLLVM_ENABLE_TERMINFO=OFF
49.endif 25.endif