lldb: make it better

[Adam Ciarciński (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Adam Ciarciński <adam%defguard.net@localhost>
Pushed By:	adam
Date:		Mon Oct 27 11:27:02 2025 +0100
Changeset:	b2be3c78b958389409370f5289c07e68a6094658

Modified Files:
	lldb/Makefile
	lldb/distinfo
	lldb/options.mk
Removed Files:
	lldb/patches/patch-cmake_modules_LLDBStandalone.cmake

Log Message:
lldb: make it better

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=b2be3c78b958389409370f5289c07e68a6094658

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

diffstat:
 lldb/Makefile                                         | 11 +++++------
 lldb/distinfo                                         |  1 -
 lldb/options.mk                                       |  2 --
 lldb/patches/patch-cmake_modules_LLDBStandalone.cmake | 12 ------------
 4 files changed, 5 insertions(+), 21 deletions(-)

diffs:
diff --git a/lldb/Makefile b/lldb/Makefile
index a3d152df16..f1fe63284b 100644
--- a/lldb/Makefile
+++ b/lldb/Makefile
@@ -15,19 +15,18 @@ DEPENDS+=	clang-${PKGVERSION_NOREV}{,nb*}:../../wip/clang
 DEPENDS+=	swig3>=3.0:../../devel/swig3
 DEPENDS+=	${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
 
-USE_CXX_FEATURES=	c++14
+USE_CXX_FEATURES=	c++17
 USE_LANGUAGES=		c c++
 GCC_REQD+=		7
 PY_PATCHPLIST=		yes
 
 CMAKE_CONFIGURE_ARGS+=	-DLLVM_CONFIG=${LLVM_CONFIG_PATH:Q}
-CMAKE_CONFIGURE_ARGS+=	-DLLVM_ENABLE_LIBCXX=ON
+#CMAKE_CONFIGURE_ARGS+=	-DLLVM_ENABLE_LIBCXX=ON
 CMAKE_CONFIGURE_ARGS+=	-DCMAKE_BUILD_TYPE=Release
-CMAKE_CONFIGURE_ARGS+=	-DCMAKE_C_COMPILER=${CC:Q}
-CMAKE_CONFIGURE_ARGS+=	-DCMAKE_CXX_COMPILER=${CXX:Q}
+CMAKE_CONFIGURE_ARGS+=	-DCMAKE_C_COMPILER=${PREFIX}/bin/clang
+CMAKE_CONFIGURE_ARGS+=	-DCMAKE_CXX_COMPILER=${PREFIX}/bin/clang++
 CMAKE_CONFIGURE_ARGS+=	-DHAVE_CXX_ATOMICS64_WITHOUT_LIB=ON
 CMAKE_CONFIGURE_ARGS+=	-DLLDB_CODESIGN_IDENTITY=""
-CMAKE_CONFIGURE_ARGS+=	-DLLDB_USE_SYSTEM_SIX=ON
 CMAKE_CONFIGURE_ARGS+=	-DPYTHON_HOME=${PREFIX}
 
 CHECK_PORTABILITY_SKIP=	utils/buildit/build_llvm
@@ -73,7 +72,7 @@ NOT_FOR_PLATFORM+=	NetBSD-*-powerpc
 .include "../../devel/swig4/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../wip/clang/buildlink3.mk"
-.include "../../wip/libcxx/buildlink3.mk"
+#.include "../../wip/libcxx/buildlink3.mk"
 .include "../../wip/llvm/buildlink3.mk"
 .include "../../lang/lua/buildlink3.mk"
 .include "../../lang/python/application.mk"
diff --git a/lldb/distinfo b/lldb/distinfo
index 3d25ffd809..72db1a92f3 100644
--- a/lldb/distinfo
+++ b/lldb/distinfo
@@ -3,5 +3,4 @@ $NetBSD: distinfo,v 1.35 2023/01/12 19:32:53 adam Exp $
 BLAKE2s (llvm-project-20.1.8.src.tar.xz) = c1587d5118d1d27f773127d6b72528b9d6f0eb78156b2679ebd4132369572e45
 SHA512 (llvm-project-20.1.8.src.tar.xz) = f330e72e6a1da468569049437cc0ba7a41abb816ccece7367189344f7ebfef730f4788ac7af2bef0aa8a49341c15ab1d31e941ffa782f264d11fe0dc05470773
 Size (llvm-project-20.1.8.src.tar.xz) = 147242952 bytes
-SHA1 (patch-cmake_modules_LLDBStandalone.cmake) = 773d420c3fd2c9b4af6af9d42c5778e96a1ae52b
 SHA1 (patch-source_API_CMakeLists.txt) = 32840580507b3a7d05e76485da5830e92a76bb06
diff --git a/lldb/options.mk b/lldb/options.mk
index bebd642f2e..36a53bda12 100644
--- a/lldb/options.mk
+++ b/lldb/options.mk
@@ -18,8 +18,6 @@ CMAKE_CONFIGURE_ARGS+=	-DLLVM_INCLUDE_TESTS=OFF
 .include "../../mk/curses.buildlink3.mk"
 .include "../../mk/terminfo.buildlink3.mk"
 CMAKE_CONFIGURE_ARGS+=	-DLLDB_ENABLE_CURSES=ON
-CMAKE_CONFIGURE_ARGS+=	-DLLVM_ENABLE_TERMINFO=ON
 .else
 CMAKE_CONFIGURE_ARGS+=	-DLLDB_ENABLE_CURSES=OFF
-CMAKE_CONFIGURE_ARGS+=	-DLLVM_ENABLE_TERMINFO=OFF
 .endif
diff --git a/lldb/patches/patch-cmake_modules_LLDBStandalone.cmake b/lldb/patches/patch-cmake_modules_LLDBStandalone.cmake
deleted file mode 100644
index 0431be1670..0000000000
--- a/lldb/patches/patch-cmake_modules_LLDBStandalone.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-cmake_modules_LLDBStandalone.cmake,v 1.5 2022/08/12 08:54:31 pin Exp $
-
---- cmake/modules/LLDBStandalone.cmake.orig	2022-06-22 16:46:24.000000000 +0000
-+++ cmake/modules/LLDBStandalone.cmake
-@@ -85,7 +85,6 @@ list(APPEND CMAKE_MODULE_PATH "${LLVM_DI
- include(AddLLVM)
- include(TableGen)
- include(HandleLLVMOptions)
--include(CheckAtomic)
- include(LLVMDistributionSupport)
- 
- set(PACKAGE_VERSION "${LLVM_PACKAGE_VERSION}")