git: f3f26e7c8480 - main - devel/llvm-cheriot: Fix !CLANG plist

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Brooks Davis <brooks_at_FreeBSD.org>
Date: Mon, 13 Jan 2025 23:53:22 UTC
The branch main has been updated by brooks:

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

commit f3f26e7c84802f0a61001987c1b5b8a43fad389d
Author:     Brooks Davis <brooks@FreeBSD.org>
AuthorDate: 2025-01-13 23:53:15 +0000
Commit:     Brooks Davis <brooks@FreeBSD.org>
CommitDate: 2025-01-13 23:53:15 +0000

    devel/llvm-cheriot: Fix !CLANG plist
    
    llvm-debuginfo-analyzer isn't part of Clang, but was matched by the
    overly broad pattern `-analyzer`.
    
    Reported by:    jrtc27
    Sponsored by:   DARPA, AFRL
---
 devel/llvm-cheri/Makefile    | 2 +-
 devel/llvm-cheriot/pkg-plist | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/devel/llvm-cheri/Makefile b/devel/llvm-cheri/Makefile
index 6a251af067fe..1949d035097c 100644
--- a/devel/llvm-cheri/Makefile
+++ b/devel/llvm-cheri/Makefile
@@ -146,7 +146,7 @@ CONFIGURE_TARGET:=${ARCH:C/amd64/x86_64/:C/armv6hf/armv6/}-portbld-${OPSYS:tl}${
 LLVM_ENABLE_PROJECTS+=	clang
 COMMANDS+=	${CLANG_COMMANDS}
 MAN1SRCS+=	${CLANG_MAN1SRCS}
-CLANG_PATTERN=	(c-index-test|clang|diagtool|hmaptool|intercept-|libear|libscanbuild|analyze-|scan-|Reporter.py|ScanView.py|scanview.css|sorttable.js|startfile.py|-analyzer|AnalyzerPlugin.so)
+CLANG_PATTERN=	(c-index-test|clang|diagtool|hmaptool|intercept-|libear|libscanbuild|analyze-|scan-|Reporter.py|ScanView.py|scanview.css|sorttable.js|startfile.py|c..-analyzer|AnalyzerPlugin.so)
 USES+=		gnome
 .endif
 
diff --git a/devel/llvm-cheriot/pkg-plist b/devel/llvm-cheriot/pkg-plist
index 49cda8a616da..ecc60098823c 100644
--- a/devel/llvm-cheriot/pkg-plist
+++ b/devel/llvm-cheriot/pkg-plist
@@ -68,7 +68,7 @@ bin/llvm-xray%%COMMAND_SUFFIX%%
 bin/opt%%COMMAND_SUFFIX%%
 bin/sancov%%COMMAND_SUFFIX%%
 bin/amdgpu-arch%%COMMAND_SUFFIX%%
-%%CLANG%%bin/llvm-debuginfo-analyzer%%COMMAND_SUFFIX%%
+bin/llvm-debuginfo-analyzer%%COMMAND_SUFFIX%%
 bin/llvm-remarkutil%%COMMAND_SUFFIX%%
 bin/nvptx-arch%%COMMAND_SUFFIX%%
 %%CLANG%%bin/analyze-build%%COMMAND_SUFFIX%%
@@ -175,7 +175,7 @@ llvm%%LLVM_SUFFIX%%/bin/llvm-cvtres
 llvm%%LLVM_SUFFIX%%/bin/llvm-cxxdump
 llvm%%LLVM_SUFFIX%%/bin/llvm-cxxfilt
 llvm%%LLVM_SUFFIX%%/bin/llvm-cxxmap
-%%CLANG%%llvm%%LLVM_SUFFIX%%/bin/llvm-debuginfo-analyzer
+llvm%%LLVM_SUFFIX%%/bin/llvm-debuginfo-analyzer
 llvm%%LLVM_SUFFIX%%/bin/llvm-debuginfod
 llvm%%LLVM_SUFFIX%%/bin/llvm-debuginfod-find
 llvm%%LLVM_SUFFIX%%/bin/llvm-diff