git: b2026d34430c - main - devel/llvm20: Link LLDB with libxml2 to allow an interop with openocd

The branch main has been updated by brooks:

URL: https://cgit.FreeBSD.org/ports/commit/?id=b2026d34430c8ce9df02f84460d406ee2cd9a141

commit b2026d34430c8ce9df02f84460d406ee2cd9a141
Author:     Brooks Davis <brooks@FreeBSD.org>
AuthorDate: 2025-06-30 21:58:37 +0000
Commit:     Brooks Davis <brooks@FreeBSD.org>
CommitDate: 2025-06-30 21:58:37 +0000

    devel/llvm20: Link LLDB with libxml2 to allow an interop with openocd
    
    LLDB auto detects libxml2 by default and unlike with CLANG it's useful
    for openocd support so depend on it.
    
    Remove a seemingly useless USES=gnome from CLANG that we've been
    carrying forward by accident.
    
    While here, update to lua 5.4.
    
    PR:             268303
    Submitted by:   arrowd (libxml2)
    Differential Revision:  https://reviews.freebsd.org/D50715
---
 devel/llvm20/Makefile  | 7 ++++---
 devel/llvm20/pkg-plist | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/devel/llvm20/Makefile b/devel/llvm20/Makefile
index 5cf0a31c6c90..e13b39601f2b 100644
--- a/devel/llvm20/Makefile
+++ b/devel/llvm20/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	llvm
 DISTVERSION=	20.1.6
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	devel lang
 MASTER_SITES=	https://github.com/llvm/llvm-project/releases/download/llvmorg-${DISTVERSION}/
 #MASTER_SITES=	https://github.com/llvm/llvm-project/releases/download/llvmorg-${DISTVERSION:S/rc/-rc/}/
@@ -199,7 +199,8 @@ LLDB_CMAKE_ON= \
 LLDB_DESC=		Install lldb, the LLVM debugger
 LLDB_IMPLIES=		CLANG
 LLDB_PLIST_SUB=		PYTHON_ABIVER=${PYTHON_ABIVER}
-LLDB_USES=		lua:53 libedit
+LLDB_USES=		gnome lua:54 libedit
+LLDB_USE=		gnome=libxml2
 LLDB_VARS=		_USES_PYTHON=python
 MLIR_DESC=		Multi-Level Intermediate Representation
 OPENMP_DESC=		Install libomp, the LLVM OpenMP runtime library
@@ -288,7 +289,6 @@ LLVM_ENABLE_PROJECTS+=	clang
 COMMANDS+=	${CLANG_COMMANDS}
 MAN1SRCS+=	${CLANG_MAN1SRCS}
 CLANG_PATTERN=	(amdgpu-arch|c-index-test|clang|diagtool|hmaptool|intercept-|libear|libscanbuild|nvptx-arch|analyze-|scan-|Reporter.py|ScanView.py|scanview.css|sorttable.js|startfile.py|c..-analyzer|AnalyzerPlugin.so)
-USES+=		gnome
 .endif
 
 .if ${PORT_OPTIONS:MCOMPILER_RT}
@@ -637,6 +637,7 @@ build-plist:
 	    ${GREP} -v '_ignorelist.txt$$' | \
 	    ${GREP} -v '[/-]lit$$' | ${GREP} -v 'FileCheck$$' | \
 	    ${GREP} -v man/man1 | ${SED} -e 's|${STAGEDIR}${PREFIX}/||' \
+	    -e 's|${LUA_MODLIBDIR:C|${PREFIX}/||}|%%LUA_MODLIBDIR%%|' \
 	    -e 's|${PYTHON_SITELIBDIR:C|${PREFIX}/||}|%%PYTHON_SITELIBDIR%%|' \
 	    -e 's|${PYTHON_TAG:C/\./\\./g}${PYTHON_ABIVER}|%%PYTHON_TAG%%%%PYTHON_ABIVER%%|' \
 	    -e 's|${LLVM_RELEASE}|%%LLVM_RELEASE%%|' \
diff --git a/devel/llvm20/pkg-plist b/devel/llvm20/pkg-plist
index 1dea309748f7..3a6e59cbbd51 100644
--- a/devel/llvm20/pkg-plist
+++ b/devel/llvm20/pkg-plist
@@ -146,6 +146,7 @@ bin/sancov%%LLVM_SUFFIX%%
 %%LIT%%llvm%%LLVM_SUFFIX%%/bin/lit
 %%LIT%%bin/llvm-lit%%LLVM_SUFFIX%%
 %%LIT%%llvm%%LLVM_SUFFIX%%/bin/llvm-lit
+%%LLDB%%llvm%%LLVM_SUFFIX%%/%%LUA_MODLIBDIR%%/lldb.so
 %%PYCLANG%%llvm%%LLVM_SUFFIX%%/%%PYTHON_SITELIBDIR%%/clang/__init__.py
 %%PYCLANG%%llvm%%LLVM_SUFFIX%%/%%PYTHON_SITELIBDIR%%/clang/cindex.py
 %%LLDB%%llvm%%LLVM_SUFFIX%%/%%PYTHON_SITELIBDIR%%/lldb/__init__.py
@@ -7427,7 +7428,6 @@ llvm%%LLVM_SUFFIX%%/lib/libRemarks.so.%%LLVM_MAJOR_MINOR%%
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libscanbuild/resources/selectable.js
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libscanbuild/resources/sorttable.js
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libscanbuild/shell.py
-%%LLDB%%llvm%%LLVM_SUFFIX%%/lib/lua/5.3/lldb.so
 %%MLIR%%llvm%%LLVM_SUFFIX%%/lib/objects-Release/obj.MLIRCAPIAMDGPU/AMDGPU.cpp.o
 %%MLIR%%llvm%%LLVM_SUFFIX%%/lib/objects-Release/obj.MLIRCAPIArith/Arith.cpp.o
 %%MLIR%%llvm%%LLVM_SUFFIX%%/lib/objects-Release/obj.MLIRCAPIAsync/Async.cpp.o