git: e08503b86df7 - main - devel/llvm19: Fix !CLANG plist and OPENMP
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 13 Jan 2025 23:53:27 UTC
The branch main has been updated by brooks:
URL: https://cgit.FreeBSD.org/ports/commit/?id=e08503b86df7a69d55575669966a0dae54f84e93
commit e08503b86df7a69d55575669966a0dae54f84e93
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/llvm19: Fix !CLANG plist and OPENMP
llvm-debuginfo-analyzer isn't part of Clang, but was matched by the
overly broad pattern `-analyzer`. [0]
Fix USE_LDCONFIG for OPENMP. [1]
Reported by: jrtc27 [0], tijl [1]
Sponsored by: DARPA, AFRL
---
devel/llvm19/Makefile | 5 +++--
devel/llvm19/pkg-plist | 4 ++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/devel/llvm19/Makefile b/devel/llvm19/Makefile
index b0747b9cb6f4..6d324c435f55 100644
--- a/devel/llvm19/Makefile
+++ b/devel/llvm19/Makefile
@@ -1,6 +1,6 @@
PORTNAME= llvm
DISTVERSION= 19.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/}/
@@ -286,7 +286,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
@@ -331,6 +331,7 @@ COMMANDS+= ${MLIR_COMMANDS}
.if ${PORT_OPTIONS:MOPENMP}
LLVM_ENABLE_PROJECTS+= openmp
+USE_LDCONFIG+= ${LLVM_PREFIX}/lib/${CONFIGURE_TARGET}
MAN1SRCS+= ${OPENMP_MAN1SRCS}
COMMANDS+= ${OPENMP_COMMANDS}
.endif
diff --git a/devel/llvm19/pkg-plist b/devel/llvm19/pkg-plist
index a79003147b0f..bc19e2720611 100644
--- a/devel/llvm19/pkg-plist
+++ b/devel/llvm19/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%%
@@ -236,7 +236,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