git: e85cd16f106c - main - devel/llvm*: minor rework [NFC]
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 20 Oct 2026 18:20:52 UTC
The branch main has been updated by brooks:
URL: https://cgit.FreeBSD.org/ports/commit/?id=e85cd16f106cf5db6d5c59c1c79ec2a50276ad9f
commit e85cd16f106cf5db6d5c59c1c79ec2a50276ad9f
Author: Brooks Davis <brooks@FreeBSD.org>
AuthorDate: 2026-10-20 18:17:55 +0000
Commit: Brooks Davis <brooks@FreeBSD.org>
CommitDate: 2026-10-20 18:19:38 +0000
devel/llvm*: minor rework [NFC]
Consolidate all the _PATTERN variables in one location and define them
unconditionally.
---
devel/llvm-cheri/Makefile | 3 ++-
devel/llvm-cheriot/Makefile | 3 ++-
devel/llvm-devel/Makefile | 13 ++++++++-----
devel/llvm12/Makefile | 15 ++++++++-------
devel/llvm13/Makefile | 15 ++++++++-------
devel/llvm14/Makefile | 15 ++++++++-------
devel/llvm15/Makefile | 15 ++++++++-------
devel/llvm16/Makefile | 18 ++++++++++--------
devel/llvm17/Makefile | 18 ++++++++++--------
devel/llvm18/Makefile | 17 +++++++++--------
devel/llvm19/Makefile | 18 ++++++++++--------
devel/llvm20/Makefile | 18 ++++++++++--------
devel/llvm21/Makefile | 18 ++++++++++--------
devel/llvm22/Makefile | 18 ++++++++++--------
devel/llvm23/Makefile | 18 ++++++++++--------
15 files changed, 123 insertions(+), 99 deletions(-)
diff --git a/devel/llvm-cheri/Makefile b/devel/llvm-cheri/Makefile
index 3e675a965385..63b1ba8e0ebc 100644
--- a/devel/llvm-cheri/Makefile
+++ b/devel/llvm-cheri/Makefile
@@ -119,6 +119,8 @@ STRIP_LIBS= BugpointPasses.so \
${LIBNAME}.0 \
libLTO.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)
+
EXTRAS_LIBS= libclangApplyReplacements \
libclangChangeNamespace \
libclangDaemon \
@@ -150,7 +152,6 @@ 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|c..-analyzer|AnalyzerPlugin.so)
USES+= gnome
.endif
diff --git a/devel/llvm-cheriot/Makefile b/devel/llvm-cheriot/Makefile
index ce3bb201fea0..3db5b8a2264b 100644
--- a/devel/llvm-cheriot/Makefile
+++ b/devel/llvm-cheriot/Makefile
@@ -115,6 +115,8 @@ STRIP_LIBS= BugpointPasses.so \
${LIBNAME}.0 \
libLTO.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)
+
EXTRAS_LIBS= libclangApplyReplacements \
libclangChangeNamespace \
libclangDaemon \
@@ -146,7 +148,6 @@ 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|c..-analyzer|AnalyzerPlugin.so)
USES+= gnome
.endif
diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile
index 58475fd04dfa..ae1544abf9d2 100644
--- a/devel/llvm-devel/Makefile
+++ b/devel/llvm-devel/Makefile
@@ -187,6 +187,10 @@ STRIP_LIBS= BugpointPasses.so \
${LIBNAME}.0 \
libLTO.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)
+
+COMPILER_RT_PATTERN= (sanitizer|include.xray|include\/(fuzzer|orc)|profile\/InstrProfData.inc|profile\/instr_prof_interface.h)
+
EXTRAS_LIBS= \
libclangApplyReplacements \
libclangChangeNamespace \
@@ -214,6 +218,10 @@ FLANG_PATTERN= ${FLANG_COMMANDS:S/^/bin./:tW:C/ */|/g}|flang|libCUF|libFIR|libF
MLIR_PATTERN= ${MLIR_COMMANDS:S/^/bin./:tW:C/ */|/g}|mlir|libMLIR|obj.MLIRCAP
+OPENMP_PATTERN= cmake\/openmp|libarcher|lib[ig]*omp|omp.h|ompt.h|ompt-multiplex.h|ompx.h|omp-tools.h|omp_lib
+
+POLLY_PATTERN= include\/polly|cmake\/polly|LLVMPolly.so|libPolly
+
.include <bsd.port.options.mk>
# keep in sync with /usr/src/lib/clang/clang.build.mk
@@ -236,12 +244,10 @@ 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|c..-analyzer|AnalyzerPlugin.so)
.endif
.if ${PORT_OPTIONS:MCOMPILER_RT}
LLVM_ENABLE_RUNTIMES+= compiler-rt
-COMPILER_RT_PATTERN= (sanitizer|include.xray|include\/(fuzzer|orc)|profile\/InstrProfData.inc|profile\/instr_prof_interface.h)
.endif
.if ${PORT_OPTIONS:MEXTRAS}
@@ -286,14 +292,11 @@ USE_LDCONFIG+= ${LLVM_PREFIX}/lib/${CONFIGURE_TARGET}
MAN1SRCS+= ${OPENMP_MAN1SRCS}
COMMANDS+= ${OPENMP_COMMANDS}
.endif
-#OPENMP_PATTERN= ${OPENMP_COMMANDS:tW:C/ */|/g}|cmake\/openmp|libarcher|lib[ig]*omp|omp.h|ompt.h|ompt-multiplex.h|ompx.h|omp-tools.h|omp_lib
-OPENMP_PATTERN= cmake\/openmp|libarcher|lib[ig]*omp|omp.h|ompt.h|ompt-multiplex.h|ompx.h|omp-tools.h|omp_lib
.if ${PORT_OPTIONS:MPOLLY}
LLVM_ENABLE_PROJECTS+= polly
MAN1SRCS+= ${POLLY_MAN1SRCS}
.endif
-POLLY_PATTERN= include\/polly|cmake\/polly|LLVMPolly.so|libPolly
.if defined(LLVM_ENABLE_PROJECTS)
CMAKE_ARGS+= -DLLVM_ENABLE_PROJECTS="${LLVM_ENABLE_PROJECTS:ts;}"
diff --git a/devel/llvm12/Makefile b/devel/llvm12/Makefile
index 95c308aac773..c875568e3011 100644
--- a/devel/llvm12/Makefile
+++ b/devel/llvm12/Makefile
@@ -155,6 +155,10 @@ STRIP_LIBS= BugpointPasses.so \
${LIBNAME}.0 \
libLTO.so
+CLANG_PATTERN= (c-index-test|clang|diagtool|hmaptool|scan-|Reporter.py|ScanView.py|scanview.css|sorttable.js|startfile.py|-analyzer|AnalyzerPlugin.so)
+
+COMPILER_RT_PATTERN= (sanitizer|include.xray|include\/fuzzer|profile\/InstrProfData.inc)
+
EXTRAS_LIBS= libclangApplyReplacements \
libclangChangeNamespace \
libclangDaemon \
@@ -175,6 +179,10 @@ EXTRAS_LIBS= libclangApplyReplacements \
EXTRAS_FILES= index.js
EXTRAS_PATTERN= ${EXTRAS_COMMANDS:tW:C/ */|/g}|${EXTRAS_LIBS:tW:C/ */|/g}|${EXTRAS_FILES:tW:C/ */|/g}
+OPENMP_PATTERN= libarcher|lib[ig]*omp|omp.h|ompt.h|ompt-multiplex.h|omp-tools.h
+
+PYCLANG_PATTERN= (clang\/(__init__|cindex|enumerations).py)$$
+
.include <bsd.port.options.mk>
# keep in sync with /usr/src/lib/clang/clang.build.mk
@@ -197,13 +205,11 @@ 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= (c-index-test|clang|diagtool|hmaptool|scan-|Reporter.py|ScanView.py|scanview.css|sorttable.js|startfile.py|-analyzer|AnalyzerPlugin.so)
USES+= gnome
.endif
.if ${PORT_OPTIONS:MCOMPILER_RT}
LLVM_ENABLE_PROJECTS+= compiler-rt
-COMPILER_RT_PATTERN= (sanitizer|include.xray|include\/fuzzer|profile\/InstrProfData.inc)
.endif
.if ${PORT_OPTIONS:MEXTRAS}
@@ -228,11 +234,6 @@ PORTDOCS+= lld
LLVM_ENABLE_PROJECTS+= openmp
MAN1SRCS+= ${OPENMP_MAN1SRCS}
.endif
-OPENMP_PATTERN= libarcher|lib[ig]*omp|omp.h|ompt.h|ompt-multiplex.h|omp-tools.h
-
-.if ${PORT_OPTIONS:MPYCLANG}
-PYCLANG_PATTERN= (clang\/(__init__|cindex|enumerations).py)$$
-.endif
.if defined(LLVM_ENABLE_PROJECTS)
CMAKE_ARGS+= -DLLVM_ENABLE_PROJECTS="${LLVM_ENABLE_PROJECTS:ts;}"
diff --git a/devel/llvm13/Makefile b/devel/llvm13/Makefile
index a78fc866cacc..6c105e5f9586 100644
--- a/devel/llvm13/Makefile
+++ b/devel/llvm13/Makefile
@@ -175,6 +175,10 @@ STRIP_LIBS= BugpointPasses.so \
${LIBNAME}.0 \
libLTO.so
+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)
+
+COMPILER_RT_PATTERN= (sanitizer|include.xray|include\/fuzzer|profile\/InstrProfData.inc)
+
EXTRAS_LIBS= libclangApplyReplacements \
libclangChangeNamespace \
libclangDaemon \
@@ -199,6 +203,10 @@ FLANG_PATTERN= ${FLANG_COMMANDS:S/^/bin./:tW:C/ */|/g}|flang|libFIROptimizer|li
MLIR_PATTERN= ${MLIR_COMMANDS:S/^/bin./:tW:C/ */|/g}|mlir|libMLIR
+OPENMP_PATTERN= ${OPENMP_COMMANDS:tW:C/ */|/g}|cmake\/openmp|libarcher|lib[ig]*omp|omp.h|ompt.h|ompt-multiplex.h|omp-tools.h
+
+PYCLANG_PATTERN= (clang\/(__init__|cindex|enumerations).py)$$
+
.include <bsd.port.options.mk>
# keep in sync with /usr/src/lib/clang/clang.build.mk
@@ -221,13 +229,11 @@ 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= (c-index-test|clang|diagtool|hmaptool|intercept-|libear|libscanbuild|analyze-|scan-|Reporter.py|ScanView.py|scanview.css|sorttable.js|startfile.py|-analyzer|AnalyzerPlugin.so)
USES+= gnome
.endif
.if ${PORT_OPTIONS:MCOMPILER_RT}
LLVM_ENABLE_PROJECTS+= compiler-rt
-COMPILER_RT_PATTERN= (sanitizer|include.xray|include\/fuzzer|profile\/InstrProfData.inc)
.endif
.if ${PORT_OPTIONS:MEXTRAS}
@@ -263,11 +269,6 @@ LLVM_ENABLE_PROJECTS+= openmp
MAN1SRCS+= ${OPENMP_MAN1SRCS}
COMMANDS+= ${OPENMP_COMMANDS}
.endif
-OPENMP_PATTERN= ${OPENMP_COMMANDS:tW:C/ */|/g}|cmake\/openmp|libarcher|lib[ig]*omp|omp.h|ompt.h|ompt-multiplex.h|omp-tools.h
-
-.if ${PORT_OPTIONS:MPYCLANG}
-PYCLANG_PATTERN= (clang\/(__init__|cindex|enumerations).py)$$
-.endif
.if defined(LLVM_ENABLE_PROJECTS)
CMAKE_ARGS+= -DLLVM_ENABLE_PROJECTS="${LLVM_ENABLE_PROJECTS:ts;}"
diff --git a/devel/llvm14/Makefile b/devel/llvm14/Makefile
index dff8dceb9559..5eda10c25bb9 100644
--- a/devel/llvm14/Makefile
+++ b/devel/llvm14/Makefile
@@ -175,6 +175,10 @@ STRIP_LIBS= BugpointPasses.so \
${LIBNAME}.0 \
libLTO.so
+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)
+
+COMPILER_RT_PATTERN= (sanitizer|include.xray|include\/fuzzer|profile\/InstrProfData.inc)
+
EXTRAS_LIBS= libclangApplyReplacements \
libclangChangeNamespace \
libclangDaemon \
@@ -199,6 +203,10 @@ FLANG_PATTERN= ${FLANG_COMMANDS:S/^/bin./:tW:C/ */|/g}|flang|libFIR|libFortran
MLIR_PATTERN= ${MLIR_COMMANDS:S/^/bin./:tW:C/ */|/g}|mlir|libMLIR|obj.MLIRCAP
+OPENMP_PATTERN= ${OPENMP_COMMANDS:tW:C/ */|/g}|cmake\/openmp|libarcher|lib[ig]*omp|omp.h|ompt.h|ompt-multiplex.h|omp-tools.h
+
+PYCLANG_PATTERN= (clang\/(__init__|cindex|enumerations).py)$$
+
.include <bsd.port.options.mk>
# keep in sync with /usr/src/lib/clang/clang.build.mk
@@ -221,13 +229,11 @@ 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= (c-index-test|clang|diagtool|hmaptool|intercept-|libear|libscanbuild|analyze-|scan-|Reporter.py|ScanView.py|scanview.css|sorttable.js|startfile.py|-analyzer|AnalyzerPlugin.so)
USES+= gnome
.endif
.if ${PORT_OPTIONS:MCOMPILER_RT}
LLVM_ENABLE_PROJECTS+= compiler-rt
-COMPILER_RT_PATTERN= (sanitizer|include.xray|include\/fuzzer|profile\/InstrProfData.inc)
.endif
.if ${PORT_OPTIONS:MEXTRAS}
@@ -263,11 +269,6 @@ LLVM_ENABLE_PROJECTS+= openmp
MAN1SRCS+= ${OPENMP_MAN1SRCS}
COMMANDS+= ${OPENMP_COMMANDS}
.endif
-OPENMP_PATTERN= ${OPENMP_COMMANDS:tW:C/ */|/g}|cmake\/openmp|libarcher|lib[ig]*omp|omp.h|ompt.h|ompt-multiplex.h|omp-tools.h
-
-.if ${PORT_OPTIONS:MPYCLANG}
-PYCLANG_PATTERN= (clang\/(__init__|cindex|enumerations).py)$$
-.endif
.if defined(LLVM_ENABLE_PROJECTS)
CMAKE_ARGS+= -DLLVM_ENABLE_PROJECTS="${LLVM_ENABLE_PROJECTS:ts;}"
diff --git a/devel/llvm15/Makefile b/devel/llvm15/Makefile
index a294827cd6f9..776352368eee 100644
--- a/devel/llvm15/Makefile
+++ b/devel/llvm15/Makefile
@@ -195,6 +195,10 @@ STRIP_LIBS= BugpointPasses.so \
${LIBNAME}.0 \
libLTO.so
+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)
+
+COMPILER_RT_PATTERN= (sanitizer|include.xray|include\/(fuzzer|orc)|profile\/InstrProfData.inc)
+
EXTRAS_LIBS= libclangApplyReplacements \
libclangChangeNamespace \
libclangDaemon \
@@ -221,6 +225,10 @@ FLANG_PATTERN= ${FLANG_COMMANDS:S/^/bin./:tW:C/ */|/g}|flang|libFIR|libFortran
MLIR_PATTERN= ${MLIR_COMMANDS:S/^/bin./:tW:C/ */|/g}|mlir|libMLIR|obj.MLIRCAP
+OPENMP_PATTERN= ${OPENMP_COMMANDS:tW:C/ */|/g}|cmake\/openmp|libarcher|lib[ig]*omp|omp.h|ompt.h|ompt-multiplex.h|omp-tools.h
+
+PYCLANG_PATTERN= (clang\/(__init__|cindex|enumerations).py)$$
+
.include <bsd.port.options.mk>
# keep in sync with /usr/src/lib/clang/clang.build.mk
@@ -243,13 +251,11 @@ 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= (c-index-test|clang|diagtool|hmaptool|intercept-|libear|libscanbuild|analyze-|scan-|Reporter.py|ScanView.py|scanview.css|sorttable.js|startfile.py|-analyzer|AnalyzerPlugin.so)
USES+= gnome
.endif
.if ${PORT_OPTIONS:MCOMPILER_RT}
LLVM_ENABLE_PROJECTS+= compiler-rt
-COMPILER_RT_PATTERN= (sanitizer|include.xray|include\/(fuzzer|orc)|profile\/InstrProfData.inc)
.endif
.if ${PORT_OPTIONS:MEXTRAS}
@@ -285,11 +291,6 @@ LLVM_ENABLE_PROJECTS+= openmp
MAN1SRCS+= ${OPENMP_MAN1SRCS}
COMMANDS+= ${OPENMP_COMMANDS}
.endif
-OPENMP_PATTERN= ${OPENMP_COMMANDS:tW:C/ */|/g}|cmake\/openmp|libarcher|lib[ig]*omp|omp.h|ompt.h|ompt-multiplex.h|omp-tools.h
-
-.if ${PORT_OPTIONS:MPYCLANG}
-PYCLANG_PATTERN= (clang\/(__init__|cindex|enumerations).py)$$
-.endif
.if defined(LLVM_ENABLE_PROJECTS)
CMAKE_ARGS+= -DLLVM_ENABLE_PROJECTS="${LLVM_ENABLE_PROJECTS:ts;}"
diff --git a/devel/llvm16/Makefile b/devel/llvm16/Makefile
index ca57849495cb..19abfbdf7726 100644
--- a/devel/llvm16/Makefile
+++ b/devel/llvm16/Makefile
@@ -185,6 +185,10 @@ STRIP_LIBS= BugpointPasses.so \
${LIBNAME}.0 \
libLTO.so
+COMPILER_RT_PATTERN= (sanitizer|include.xray|include\/(fuzzer|orc)|profile\/InstrProfData.inc)
+
+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)
+
EXTRAS_LIBS= \
libclangApplyReplacements \
libclangChangeNamespace \
@@ -212,6 +216,12 @@ FLANG_PATTERN= ${FLANG_COMMANDS:S/^/bin./:tW:C/ */|/g}|flang|libFIR|libFortran|
MLIR_PATTERN= ${MLIR_COMMANDS:S/^/bin./:tW:C/ */|/g}|mlir|libMLIR|obj.MLIRCAP
+OPENMP_PATTERN= ${OPENMP_COMMANDS:tW:C/ */|/g}|cmake\/openmp|libarcher|lib[ig]*omp|omp.h|ompt.h|ompt-multiplex.h|omp-tools.h
+
+POLLY_PATTERN= include\/polly|cmake\/polly|LLVMPolly.so|libPolly
+
+PYCLANG_PATTERN= (clang\/(__init__|cindex|enumerations).py)$$
+
.include <bsd.port.options.mk>
# keep in sync with /usr/src/lib/clang/clang.build.mk
@@ -234,13 +244,11 @@ 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|c..-analyzer|AnalyzerPlugin.so)
USES+= gnome
.endif
.if ${PORT_OPTIONS:MCOMPILER_RT}
LLVM_ENABLE_PROJECTS+= compiler-rt
-COMPILER_RT_PATTERN= (sanitizer|include.xray|include\/(fuzzer|orc)|profile\/InstrProfData.inc)
.endif
.if ${PORT_OPTIONS:MEXTRAS}
@@ -276,17 +284,11 @@ LLVM_ENABLE_PROJECTS+= openmp
MAN1SRCS+= ${OPENMP_MAN1SRCS}
COMMANDS+= ${OPENMP_COMMANDS}
.endif
-OPENMP_PATTERN= ${OPENMP_COMMANDS:tW:C/ */|/g}|cmake\/openmp|libarcher|lib[ig]*omp|omp.h|ompt.h|ompt-multiplex.h|omp-tools.h
.if ${PORT_OPTIONS:MPOLLY}
LLVM_ENABLE_PROJECTS+= polly
MAN1SRCS+= ${POLLY_MAN1SRCS}
.endif
-POLLY_PATTERN= include\/polly|cmake\/polly|LLVMPolly.so|libPolly
-
-.if ${PORT_OPTIONS:MPYCLANG}
-PYCLANG_PATTERN= (clang\/(__init__|cindex|enumerations).py)$$
-.endif
.if defined(LLVM_ENABLE_PROJECTS)
CMAKE_ARGS+= -DLLVM_ENABLE_PROJECTS="${LLVM_ENABLE_PROJECTS:ts;}"
diff --git a/devel/llvm17/Makefile b/devel/llvm17/Makefile
index 964986c0d02c..421170e07797 100644
--- a/devel/llvm17/Makefile
+++ b/devel/llvm17/Makefile
@@ -189,6 +189,10 @@ STRIP_LIBS= BugpointPasses.so \
${LIBNAME}.0 \
libLTO.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)
+
+COMPILER_RT_PATTERN= (sanitizer|include.xray|include\/(fuzzer|orc)|profile\/InstrProfData.inc)
+
EXTRAS_LIBS= \
libclangApplyReplacements \
libclangChangeNamespace \
@@ -216,6 +220,12 @@ FLANG_PATTERN= ${FLANG_COMMANDS:S/^/bin./:tW:C/ */|/g}|flang|libFIR|libFortran|
MLIR_PATTERN= ${MLIR_COMMANDS:S/^/bin./:tW:C/ */|/g}|mlir|libMLIR|obj.MLIRCAP
+OPENMP_PATTERN= ${OPENMP_COMMANDS:tW:C/ */|/g}|cmake\/openmp|libarcher|lib[ig]*omp|omp.h|ompt.h|ompt-multiplex.h|omp-tools.h
+
+POLLY_PATTERN= include\/polly|cmake\/polly|LLVMPolly.so|libPolly
+
+PYCLANG_PATTERN= (clang\/(__init__|cindex|enumerations).py)$$
+
.include <bsd.port.options.mk>
# keep in sync with /usr/src/lib/clang/clang.build.mk
@@ -238,13 +248,11 @@ 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|c..-analyzer|AnalyzerPlugin.so)
USES+= gnome
.endif
.if ${PORT_OPTIONS:MCOMPILER_RT}
LLVM_ENABLE_PROJECTS+= compiler-rt
-COMPILER_RT_PATTERN= (sanitizer|include.xray|include\/(fuzzer|orc)|profile\/InstrProfData.inc)
.endif
.if ${PORT_OPTIONS:MEXTRAS}
@@ -280,17 +288,11 @@ LLVM_ENABLE_PROJECTS+= openmp
MAN1SRCS+= ${OPENMP_MAN1SRCS}
COMMANDS+= ${OPENMP_COMMANDS}
.endif
-OPENMP_PATTERN= ${OPENMP_COMMANDS:tW:C/ */|/g}|cmake\/openmp|libarcher|lib[ig]*omp|omp.h|ompt.h|ompt-multiplex.h|omp-tools.h
.if ${PORT_OPTIONS:MPOLLY}
LLVM_ENABLE_PROJECTS+= polly
MAN1SRCS+= ${POLLY_MAN1SRCS}
.endif
-POLLY_PATTERN= include\/polly|cmake\/polly|LLVMPolly.so|libPolly
-
-.if ${PORT_OPTIONS:MPYCLANG}
-PYCLANG_PATTERN= (clang\/(__init__|cindex|enumerations).py)$$
-.endif
.if defined(LLVM_ENABLE_PROJECTS)
CMAKE_ARGS+= -DLLVM_ENABLE_PROJECTS="${LLVM_ENABLE_PROJECTS:ts;}"
diff --git a/devel/llvm18/Makefile b/devel/llvm18/Makefile
index 6f755486463a..ff711ccc59c3 100644
--- a/devel/llvm18/Makefile
+++ b/devel/llvm18/Makefile
@@ -206,6 +206,10 @@ STRIP_LIBS= BugpointPasses.so \
${LIBNAME}.0 \
libLTO.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)
+
+COMPILER_RT_PATTERN= (sanitizer|include.xray|include\/(fuzzer|orc)|profile\/InstrProfData.inc|profile\/instr_prof_interface.h)
+
EXTRAS_LIBS= \
libclangApplyReplacements \
libclangChangeNamespace \
@@ -233,6 +237,11 @@ FLANG_PATTERN= ${FLANG_COMMANDS:S/^/bin./:tW:C/ */|/g}|flang|libFIR|libFortran|
MLIR_PATTERN= ${MLIR_COMMANDS:S/^/bin./:tW:C/ */|/g}|mlir|libMLIR|obj.MLIRCAP
+OPENMP_PATTERN= ${OPENMP_COMMANDS:tW:C/ */|/g}|cmake\/openmp|libarcher|lib[ig]*omp|omp.h|ompt.h|ompt-multiplex.h|ompx.h|omp-tools.h
+
+POLLY_PATTERN= include\/polly|cmake\/polly|LLVMPolly.so|libPolly
+
+PYCLANG_PATTERN= (clang\/(__init__|cindex|enumerations).py)$$
.include <bsd.port.options.mk>
# keep in sync with /usr/src/lib/clang/clang.build.mk
@@ -255,13 +264,11 @@ 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|c..-analyzer|AnalyzerPlugin.so)
USES+= gnome
.endif
.if ${PORT_OPTIONS:MCOMPILER_RT}
LLVM_ENABLE_PROJECTS+= compiler-rt
-COMPILER_RT_PATTERN= (sanitizer|include.xray|include\/(fuzzer|orc)|profile\/InstrProfData.inc|profile\/instr_prof_interface.h)
.endif
.if ${PORT_OPTIONS:MEXTRAS}
@@ -302,17 +309,11 @@ LLVM_ENABLE_PROJECTS+= openmp
MAN1SRCS+= ${OPENMP_MAN1SRCS}
COMMANDS+= ${OPENMP_COMMANDS}
.endif
-OPENMP_PATTERN= ${OPENMP_COMMANDS:tW:C/ */|/g}|cmake\/openmp|libarcher|lib[ig]*omp|omp.h|ompt.h|ompt-multiplex.h|ompx.h|omp-tools.h
.if ${PORT_OPTIONS:MPOLLY}
LLVM_ENABLE_PROJECTS+= polly
MAN1SRCS+= ${POLLY_MAN1SRCS}
.endif
-POLLY_PATTERN= include\/polly|cmake\/polly|LLVMPolly.so|libPolly
-
-.if ${PORT_OPTIONS:MPYCLANG}
-PYCLANG_PATTERN= (clang\/(__init__|cindex|enumerations).py)$$
-.endif
.if defined(LLVM_ENABLE_PROJECTS)
CMAKE_ARGS+= -DLLVM_ENABLE_PROJECTS="${LLVM_ENABLE_PROJECTS:ts;}"
diff --git a/devel/llvm19/Makefile b/devel/llvm19/Makefile
index ef3b244d95d5..c72fddac7bd7 100644
--- a/devel/llvm19/Makefile
+++ b/devel/llvm19/Makefile
@@ -238,6 +238,10 @@ STRIP_LIBS= BugpointPasses.so \
${LIBNAME}.0 \
libLTO.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)
+
+COMPILER_RT_PATTERN= (sanitizer|include.xray|include\/(fuzzer|orc)|profile\/InstrProfData.inc|profile\/instr_prof_interface.h)
+
EXTRAS_LIBS= \
libclangApplyReplacements \
libclangChangeNamespace \
@@ -265,6 +269,12 @@ FLANG_PATTERN= ${FLANG_COMMANDS:S/^/bin./:tW:C/ */|/g}|flang|libCUF|libFIR|libF
MLIR_PATTERN= ${MLIR_COMMANDS:S/^/bin./:tW:C/ */|/g}|mlir|libMLIR|obj.MLIRCAP
+OPENMP_PATTERN= cmake\/openmp|libarcher|lib[ig]*omp|omp.h|ompt.h|ompt-multiplex.h|ompx.h|omp-tools.h|omp_lib
+
+POLLY_PATTERN= include\/polly|cmake\/polly|LLVMPolly.so|libPolly
+
+PYCLANG_PATTERN= (clang\/(__init__|cindex|enumerations).py)$$
+
.include <bsd.port.options.mk>
# keep in sync with /usr/src/lib/clang/clang.build.mk
@@ -287,13 +297,11 @@ 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|c..-analyzer|AnalyzerPlugin.so)
USES+= gnome
.endif
.if ${PORT_OPTIONS:MCOMPILER_RT}
LLVM_ENABLE_PROJECTS+= compiler-rt
-COMPILER_RT_PATTERN= (sanitizer|include.xray|include\/(fuzzer|orc)|profile\/InstrProfData.inc|profile\/instr_prof_interface.h)
.endif
.if ${PORT_OPTIONS:MEXTRAS}
@@ -336,17 +344,11 @@ USE_LDCONFIG+= ${LLVM_PREFIX}/lib/${CONFIGURE_TARGET}
MAN1SRCS+= ${OPENMP_MAN1SRCS}
COMMANDS+= ${OPENMP_COMMANDS}
.endif
-OPENMP_PATTERN= cmake\/openmp|libarcher|lib[ig]*omp|omp.h|ompt.h|ompt-multiplex.h|ompx.h|omp-tools.h|omp_lib
.if ${PORT_OPTIONS:MPOLLY}
LLVM_ENABLE_PROJECTS+= polly
MAN1SRCS+= ${POLLY_MAN1SRCS}
.endif
-POLLY_PATTERN= include\/polly|cmake\/polly|LLVMPolly.so|libPolly
-
-.if ${PORT_OPTIONS:MPYCLANG}
-PYCLANG_PATTERN= (clang\/(__init__|cindex|enumerations).py)$$
-.endif
.if defined(LLVM_ENABLE_PROJECTS)
CMAKE_ARGS+= -DLLVM_ENABLE_PROJECTS="${LLVM_ENABLE_PROJECTS:ts;}"
diff --git a/devel/llvm20/Makefile b/devel/llvm20/Makefile
index 0a061a5b02a3..e804f0796402 100644
--- a/devel/llvm20/Makefile
+++ b/devel/llvm20/Makefile
@@ -242,6 +242,10 @@ STRIP_LIBS= BugpointPasses.so \
${LIBNAME}.0 \
libLTO.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)
+
+COMPILER_RT_PATTERN= (sanitizer|include.xray|include\/(fuzzer|orc)|profile\/InstrProfData.inc|profile\/instr_prof_interface.h)
+
EXTRAS_LIBS= \
libclangApplyReplacements \
libclangChangeNamespace \
@@ -269,6 +273,12 @@ FLANG_PATTERN= ${FLANG_COMMANDS:S/^/bin./:tW:C/ */|/g}|flang|libCUF|libFIR|libF
MLIR_PATTERN= ${MLIR_COMMANDS:S/^/bin./:tW:C/ */|/g}|mlir|libMLIR|obj.MLIRCAP
+OPENMP_PATTERN= cmake\/openmp|libarcher|lib[ig]*omp|omp.h|ompt.h|ompt-multiplex.h|ompx.h|omp-tools.h|omp_lib
+
+POLLY_PATTERN= include\/polly|cmake\/polly|LLVMPolly.so|libPolly
+
+PYCLANG_PATTERN= (clang\/(__init__|cindex|enumerations).py)$$
+
.include <bsd.port.options.mk>
# keep in sync with /usr/src/lib/clang/clang.build.mk
@@ -291,12 +301,10 @@ 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|c..-analyzer|AnalyzerPlugin.so)
.endif
.if ${PORT_OPTIONS:MCOMPILER_RT}
LLVM_ENABLE_RUNTIMES+= compiler-rt
-COMPILER_RT_PATTERN= (sanitizer|include.xray|include\/(fuzzer|orc)|profile\/InstrProfData.inc|profile\/instr_prof_interface.h)
.endif
.if ${PORT_OPTIONS:MEXTRAS}
@@ -339,17 +347,11 @@ USE_LDCONFIG+= ${LLVM_PREFIX}/lib/${CONFIGURE_TARGET}
MAN1SRCS+= ${OPENMP_MAN1SRCS}
COMMANDS+= ${OPENMP_COMMANDS}
.endif
-OPENMP_PATTERN= cmake\/openmp|libarcher|lib[ig]*omp|omp.h|ompt.h|ompt-multiplex.h|ompx.h|omp-tools.h|omp_lib
.if ${PORT_OPTIONS:MPOLLY}
LLVM_ENABLE_PROJECTS+= polly
MAN1SRCS+= ${POLLY_MAN1SRCS}
.endif
-POLLY_PATTERN= include\/polly|cmake\/polly|LLVMPolly.so|libPolly
-
-.if ${PORT_OPTIONS:MPYCLANG}
-PYCLANG_PATTERN= (clang\/(__init__|cindex|enumerations).py)$$
-.endif
.if defined(LLVM_ENABLE_PROJECTS)
CMAKE_ARGS+= -DLLVM_ENABLE_PROJECTS="${LLVM_ENABLE_PROJECTS:ts;}"
diff --git a/devel/llvm21/Makefile b/devel/llvm21/Makefile
index be6fcd9e39c7..f220d454a328 100644
--- a/devel/llvm21/Makefile
+++ b/devel/llvm21/Makefile
@@ -240,6 +240,10 @@ STRIP_LIBS= BugpointPasses.so \
${LIBNAME}.0 \
libLTO.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)
+
+COMPILER_RT_PATTERN= (sanitizer|include.xray|include\/(fuzzer|orc)|profile\/InstrProfData.inc|profile\/instr_prof_interface.h)
+
EXTRAS_LIBS= \
libclangApplyReplacements \
libclangChangeNamespace \
@@ -267,6 +271,12 @@ FLANG_PATTERN= ${FLANG_COMMANDS:S/^/bin./:tW:C/ */|/g}|flang|libCUF|libFIR|libF
MLIR_PATTERN= ${MLIR_COMMANDS:S/^/bin./:tW:C/ */|/g}|mlir|libMLIR|obj.MLIRCAP
+OPENMP_PATTERN= cmake\/openmp|libarcher|lib[ig]*omp|omp.h|ompt.h|ompt-multiplex.h|ompx.h|omp-tools.h|omp_lib
+
+POLLY_PATTERN= include\/polly|cmake\/polly|LLVMPolly.so|libPolly
+
+PYCLANG_PATTERN= (clang\/(__init__|cindex|enumerations).py)$$
+
.include <bsd.port.options.mk>
# keep in sync with /usr/src/lib/clang/clang.build.mk
@@ -289,12 +299,10 @@ 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|c..-analyzer|AnalyzerPlugin.so)
.endif
.if ${PORT_OPTIONS:MCOMPILER_RT}
LLVM_ENABLE_RUNTIMES+= compiler-rt
-COMPILER_RT_PATTERN= (sanitizer|include.xray|include\/(fuzzer|orc)|profile\/InstrProfData.inc|profile\/instr_prof_interface.h)
.endif
.if ${PORT_OPTIONS:MEXTRAS}
@@ -339,17 +347,11 @@ USE_LDCONFIG+= ${LLVM_PREFIX}/lib/${CONFIGURE_TARGET}
MAN1SRCS+= ${OPENMP_MAN1SRCS}
COMMANDS+= ${OPENMP_COMMANDS}
.endif
-OPENMP_PATTERN= cmake\/openmp|libarcher|lib[ig]*omp|omp.h|ompt.h|ompt-multiplex.h|ompx.h|omp-tools.h|omp_lib
.if ${PORT_OPTIONS:MPOLLY}
LLVM_ENABLE_PROJECTS+= polly
MAN1SRCS+= ${POLLY_MAN1SRCS}
.endif
-POLLY_PATTERN= include\/polly|cmake\/polly|LLVMPolly.so|libPolly
-
-.if ${PORT_OPTIONS:MPYCLANG}
-PYCLANG_PATTERN= (clang\/(__init__|cindex|enumerations).py)$$
-.endif
.if defined(LLVM_ENABLE_PROJECTS)
CMAKE_ARGS+= -DLLVM_ENABLE_PROJECTS="${LLVM_ENABLE_PROJECTS:ts;}"
diff --git a/devel/llvm22/Makefile b/devel/llvm22/Makefile
index 26f2176dbfdd..387549e12a3a 100644
--- a/devel/llvm22/Makefile
+++ b/devel/llvm22/Makefile
@@ -241,6 +241,10 @@ STRIP_LIBS= BugpointPasses.so \
${LIBNAME}.0 \
libLTO.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)
+
+COMPILER_RT_PATTERN= (sanitizer|include.xray|include\/(fuzzer|orc)|profile\/InstrProfData.inc|profile\/instr_prof_interface.h)
+
EXTRAS_LIBS= \
libclangApplyReplacements \
libclangChangeNamespace \
@@ -268,6 +272,12 @@ FLANG_PATTERN= ${FLANG_COMMANDS:S/^/bin./:tW:C/ */|/g}|flang|libCUF|libFIR|libF
MLIR_PATTERN= ${MLIR_COMMANDS:S/^/bin./:tW:C/ */|/g}|mlir|libMLIR|obj.MLIRCAP
+OPENMP_PATTERN= cmake\/openmp|libarcher|lib[ig]*omp|omp.h|ompt.h|ompt-multiplex.h|ompx.h|omp-tools.h|omp_lib
+
+POLLY_PATTERN= include\/polly|cmake\/polly|LLVMPolly.so|libPolly
+
+PYCLANG_PATTERN= (clang\/(__init__|cindex|enumerations).py)$$
+
.include <bsd.port.options.mk>
# keep in sync with /usr/src/lib/clang/clang.build.mk
@@ -290,12 +300,10 @@ 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|c..-analyzer|AnalyzerPlugin.so)
.endif
.if ${PORT_OPTIONS:MCOMPILER_RT}
LLVM_ENABLE_RUNTIMES+= compiler-rt
-COMPILER_RT_PATTERN= (sanitizer|include.xray|include\/(fuzzer|orc)|profile\/InstrProfData.inc|profile\/instr_prof_interface.h)
.endif
.if ${PORT_OPTIONS:MEXTRAS}
@@ -340,17 +348,11 @@ USE_LDCONFIG+= ${LLVM_PREFIX}/lib/${CONFIGURE_TARGET}
MAN1SRCS+= ${OPENMP_MAN1SRCS}
COMMANDS+= ${OPENMP_COMMANDS}
.endif
-OPENMP_PATTERN= cmake\/openmp|libarcher|lib[ig]*omp|omp.h|ompt.h|ompt-multiplex.h|ompx.h|omp-tools.h|omp_lib
.if ${PORT_OPTIONS:MPOLLY}
LLVM_ENABLE_PROJECTS+= polly
MAN1SRCS+= ${POLLY_MAN1SRCS}
.endif
-POLLY_PATTERN= include\/polly|cmake\/polly|LLVMPolly.so|libPolly
-
-.if ${PORT_OPTIONS:MPYCLANG}
-PYCLANG_PATTERN= (clang\/(__init__|cindex|enumerations).py)$$
-.endif
.if defined(LLVM_ENABLE_PROJECTS)
CMAKE_ARGS+= -DLLVM_ENABLE_PROJECTS="${LLVM_ENABLE_PROJECTS:ts;}"
diff --git a/devel/llvm23/Makefile b/devel/llvm23/Makefile
index cff3c135c670..7c2ead0ecfe1 100644
--- a/devel/llvm23/Makefile
+++ b/devel/llvm23/Makefile
@@ -229,6 +229,10 @@ STRIP_LIBS= BugpointPasses.so \
${LIBNAME}.0 \
libLTO.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)
+
+COMPILER_RT_PATTERN= (sanitizer|include.xray|include\/(fuzzer|orc)|profile\/InstrProfData.inc|profile\/instr_prof_interface.h)
+
EXTRAS_LIBS= \
libclangApplyReplacements \
libclangChangeNamespace \
@@ -256,6 +260,12 @@ FLANG_PATTERN= ${FLANG_COMMANDS:S/^/bin./:tW:C/ */|/g}|flang|libCUF|libFIR|libF
MLIR_PATTERN= ${MLIR_COMMANDS:S/^/bin./:tW:C/ */|/g}|mlir|libMLIR|obj.MLIRCAP
+OPENMP_PATTERN= cmake\/openmp|libarcher|lib[ig]*omp|omp.h|ompt.h|ompt-multiplex.h|ompx.h|omp-tools.h|omp_lib
+
+POLLY_PATTERN= include\/polly|cmake\/polly|LLVMPolly.so|libPolly
+
+PYCLANG_PATTERN= (clang\/(__init__|cindex|enumerations).py)$$
+
.include <bsd.port.options.mk>
# keep in sync with /usr/src/lib/clang/clang.build.mk
@@ -278,12 +288,10 @@ 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|c..-analyzer|AnalyzerPlugin.so)
.endif
.if ${PORT_OPTIONS:MCOMPILER_RT}
LLVM_ENABLE_RUNTIMES+= compiler-rt
-COMPILER_RT_PATTERN= (sanitizer|include.xray|include\/(fuzzer|orc)|profile\/InstrProfData.inc|profile\/instr_prof_interface.h)
.endif
.if ${PORT_OPTIONS:MEXTRAS}
@@ -328,17 +336,11 @@ USE_LDCONFIG+= ${LLVM_PREFIX}/lib/${CONFIGURE_TARGET}
MAN1SRCS+= ${OPENMP_MAN1SRCS}
COMMANDS+= ${OPENMP_COMMANDS}
.endif
-OPENMP_PATTERN= cmake\/openmp|libarcher|lib[ig]*omp|omp.h|ompt.h|ompt-multiplex.h|ompx.h|omp-tools.h|omp_lib
.if ${PORT_OPTIONS:MPOLLY}
LLVM_ENABLE_PROJECTS+= polly
MAN1SRCS+= ${POLLY_MAN1SRCS}
.endif
-POLLY_PATTERN= include\/polly|cmake\/polly|LLVMPolly.so|libPolly
-
-.if ${PORT_OPTIONS:MPYCLANG}
-PYCLANG_PATTERN= (clang\/(__init__|cindex|enumerations).py)$$
-.endif
.if defined(LLVM_ENABLE_PROJECTS)
CMAKE_ARGS+= -DLLVM_ENABLE_PROJECTS="${LLVM_ENABLE_PROJECTS:ts;}"