Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 13 Jan 2025 23:53:26 GMT
From:      Brooks Davis <brooks@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 460b1965554d - main - devel/llvm18: Fix !CLANG plist
Message-ID:  <202501132353.50DNrQIr045582@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by brooks:

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

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

    devel/llvm18: 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/llvm18/Makefile  | 2 +-
 devel/llvm18/pkg-plist | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/devel/llvm18/Makefile b/devel/llvm18/Makefile
index e4ed2b40d54e..a6242fd70372 100644
--- a/devel/llvm18/Makefile
+++ b/devel/llvm18/Makefile
@@ -269,7 +269,7 @@ CONFIGURE_TARGET:=${ARCH:C/amd64/x86_64/:C/arm64/aarch64/}-portbld-${OPSYS:tl}${
 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|-analyzer|AnalyzerPlugin.so)
+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
 
diff --git a/devel/llvm18/pkg-plist b/devel/llvm18/pkg-plist
index 3755e5776425..21236a36765c 100644
--- a/devel/llvm18/pkg-plist
+++ b/devel/llvm18/pkg-plist
@@ -15,7 +15,7 @@ bin/llvm-config%%LLVM_SUFFIX%%
 bin/llvm-cov%%LLVM_SUFFIX%%
 bin/llvm-cvtres%%LLVM_SUFFIX%%
 bin/llvm-cxxmap%%LLVM_SUFFIX%%
-%%CLANG%%bin/llvm-debuginfo-analyzer%%LLVM_SUFFIX%%
+bin/llvm-debuginfo-analyzer%%LLVM_SUFFIX%%
 bin/llvm-debuginfod%%LLVM_SUFFIX%%
 bin/llvm-debuginfod-find%%LLVM_SUFFIX%%
 bin/llvm-diff%%LLVM_SUFFIX%%
@@ -234,7 +234,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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202501132353.50DNrQIr045582>