git: 2986fba67c34 - main - devel/llvm-devel: handle the edge case where FLANG is on and OPENMP is off

The branch main has been updated by brooks:

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

commit 2986fba67c34cc693e18344beb0cb71094bb8149
Author:     Brooks Davis <brooks@FreeBSD.org>
AuthorDate: 2024-04-03 22:40:27 +0000
Commit:     Brooks Davis <brooks@FreeBSD.org>
CommitDate: 2024-04-03 22:40:27 +0000

    devel/llvm-devel: handle the edge case where FLANG is on and OPENMP is off
    
    PR:             277989
    Submitted by:   Trond Endrestøl <Trond.Endrestol@ximalas.info>
---
 devel/llvm-devel/Makefile  |  2 +-
 devel/llvm-devel/pkg-plist | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile
index dc5b114dce26..c5ab4ea63af3 100644
--- a/devel/llvm-devel/Makefile
+++ b/devel/llvm-devel/Makefile
@@ -290,7 +290,7 @@ 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
+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
 
 .if ${PORT_OPTIONS:MPOLLY}
 LLVM_ENABLE_PROJECTS+=	polly
diff --git a/devel/llvm-devel/pkg-plist b/devel/llvm-devel/pkg-plist
index 82e585ffa0f8..acd7e07fb758 100644
--- a/devel/llvm-devel/pkg-plist
+++ b/devel/llvm-devel/pkg-plist
@@ -1595,7 +1595,7 @@ llvm-devel/bin/verify-uselistorder
 %%FLANG%%llvm-devel/include/flang/Lower/Support/Verifier.h
 %%FLANG%%llvm-devel/include/flang/Lower/SymbolMap.h
 %%FLANG%%llvm-devel/include/flang/Lower/VectorSubscripts.h
-%%FLANG%%llvm-devel/include/flang/OpenMP/omp_lib.h
+%%FLANG%%%%OPENMP%%llvm-devel/include/flang/OpenMP/omp_lib.h
 %%FLANG%%llvm-devel/include/flang/Optimizer/Analysis/AliasAnalysis.h
 %%FLANG%%llvm-devel/include/flang/Optimizer/Analysis/TBAAForest.h
 %%FLANG%%llvm-devel/include/flang/Optimizer/Builder/BoxValue.h
@@ -1792,10 +1792,10 @@ llvm-devel/bin/verify-uselistorder
 %%FLANG%%llvm-devel/include/flang/iso_fortran_env.mod
 %%FLANG%%llvm-devel/include/flang/mma.f18.mod
 %%FLANG%%llvm-devel/include/flang/mma.mod
-%%FLANG%%llvm-devel/include/flang/omp_lib.f18.mod
-%%FLANG%%llvm-devel/include/flang/omp_lib.mod
-%%FLANG%%llvm-devel/include/flang/omp_lib_kinds.f18.mod
-%%FLANG%%llvm-devel/include/flang/omp_lib_kinds.mod
+%%FLANG%%%%OPENMP%%llvm-devel/include/flang/omp_lib.f18.mod
+%%FLANG%%%%OPENMP%%llvm-devel/include/flang/omp_lib.mod
+%%FLANG%%%%OPENMP%%llvm-devel/include/flang/omp_lib_kinds.f18.mod
+%%FLANG%%%%OPENMP%%llvm-devel/include/flang/omp_lib_kinds.mod
 %%LLD%%llvm-devel/include/lld/Common/Args.h
 %%LLD%%llvm-devel/include/lld/Common/Arrays.h
 %%LLD%%llvm-devel/include/lld/Common/CommonLinkerContext.h