Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1714162035298730"
MIME-Version: 1.0
Date: Fri, 26 Apr 2024 20:07:15 +0000
From: "Tobias Nygren" <tnn@netbsd.org>
Subject: CVS commit: pkgsrc/devel/lldb
To: pkgsrc-changes@NetBSD.org
Reply-To: tnn@netbsd.org
Message-Id: <20240426200715.EEE5EFA2C@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1714162035298730
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	tnn
Date:		Fri Apr 26 20:07:15 UTC 2024

Modified Files:
	pkgsrc/devel/lldb: options.mk

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/lldb/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1714162035298730
Content-Disposition: inline
Content-Length: 1493
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/devel/lldb/options.mk
diff -u pkgsrc/devel/lldb/options.mk:1.1 pkgsrc/devel/lldb/options.mk:1.2
--- pkgsrc/devel/lldb/options.mk:1.1	Fri Oct  6 19:16:28 2023
+++ pkgsrc/devel/lldb/options.mk	Fri Apr 26 20:07:15 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2023/10/06 19:16:28 adam Exp $
+# $NetBSD: options.mk,v 1.2 2024/04/26 20:07:15 tnn Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.lldb
 
@@ -16,34 +16,10 @@ CMAKE_ARGS+=	-DLLVM_INCLUDE_TESTS=OFF
 
 .if ${PKG_OPTIONS:Mcurses}
 .include "../../mk/curses.buildlink3.mk"
-
-.  if ${OPSYS} == "NetBSD"
-.    if exists(/usr/include/panel.h)
+.include "../../mk/terminfo.buildlink3.mk"
 CMAKE_ARGS+=	-DLLDB_ENABLE_CURSES=ON
 CMAKE_ARGS+=	-DLLVM_ENABLE_TERMINFO=ON
-.    else
-.include "../../devel/ncurses/buildlink3.mk"
-.      if exists(${BUILDLINK_PREFIX.ncurses}/include/ncurses/panel.h)
-CMAKE_ARGS+=    -DLLDB_ENABLE_CURSES=ON
-CMAKE_ARGS+=	-DLLVM_ENABLE_TERMINFO=ON
-.      else
-CMAKE_ARGS+=    -DLLDB_ENABLE_CURSES=OFF
-CMAKE_ARGS+=	-DLLVM_ENABLE_TERMINFO=OFF
-.      endif
-.    endif
-.  else
-.include "../../devel/ncurses/buildlink3.mk"
-.    if exists(${BUILDLINK_PREFIX.ncurses}/include/ncurses/panel.h)
-CMAKE_ARGS+=    -DLLDB_ENABLE_CURSES=ON
-CMAKE_ARGS+=	-DLLVM_ENABLE_TERMINFO=ON
-.    else
-CMAKE_ARGS+=    -DLLDB_ENABLE_CURSES=OFF
-CMAKE_ARGS+=	-DLLVM_ENABLE_TERMINFO=OFF
-.    endif
-.  endif
-
 .else
-
 CMAKE_ARGS+=	-DLLDB_ENABLE_CURSES=OFF
 CMAKE_ARGS+=	-DLLVM_ENABLE_TERMINFO=OFF
 .endif


--_----------=_1714162035298730--