git: c34c074fc623 - main - devel/llvm-devel: build openmp as a runtime

The branch main has been updated by brooks:

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

commit c34c074fc62387168159b9f011f99265daef5faf
Author:     Brooks Davis <brooks@FreeBSD.org>
AuthorDate: 2025-01-21 17:40:01 +0000
Commit:     Brooks Davis <brooks@FreeBSD.org>
CommitDate: 2025-01-28 01:00:01 +0000

    devel/llvm-devel: build openmp as a runtime
    
    OpenMP support can be built as a project or a runtime.  LLVM build
    documentation says that when both are available, runtime is to be
    prefered.  I'm making this change in advance of an expected change to
    split the Flang runtime from the Flang compiler build
    (https://github.com/llvm/llvm-project/pull/110217).
    
    This changes where omp_lib.h is installed for Flang use and which
    Fortran modules are installed (removes .f18.mod versions).
    
    Sponsored by:   DARPA, AFRL
---
 devel/llvm-devel/Makefile                        |  4 ++--
 devel/llvm-devel/Makefile.MAN1SRCS               |  3 +--
 devel/llvm-devel/files/patch-revert-6d7e428df611 | 17 -----------------
 devel/llvm-devel/pkg-plist                       |  4 +---
 4 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile
index ef77c0d9cf7d..bc36e5acfb8b 100644
--- a/devel/llvm-devel/Makefile
+++ b/devel/llvm-devel/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	llvm
 PORTVERSION=	${LLVM_MAJOR}.0.d${SNAPDATE}
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	devel lang
 PKGNAMESUFFIX=	${LLVM_SUFFIX}
 
@@ -279,7 +279,7 @@ COMMANDS+=	${MLIR_COMMANDS}
 .endif
 
 .if ${PORT_OPTIONS:MOPENMP}
-LLVM_ENABLE_PROJECTS+=	openmp
+LLVM_ENABLE_RUNTIMES+=	openmp
 USE_LDCONFIG+=	${LLVM_PREFIX}/lib/${CONFIGURE_TARGET}
 MAN1SRCS+=	${OPENMP_MAN1SRCS}
 COMMANDS+=	${OPENMP_COMMANDS}
diff --git a/devel/llvm-devel/Makefile.MAN1SRCS b/devel/llvm-devel/Makefile.MAN1SRCS
index a2ad7ea5ac53..b564a5c8df45 100644
--- a/devel/llvm-devel/Makefile.MAN1SRCS
+++ b/devel/llvm-devel/Makefile.MAN1SRCS
@@ -66,8 +66,7 @@ LIT_MAN1SRCS= \
 	lit.1 \
 	FileCheck.1
 
-OPENMP_MAN1SRCS= \
-	llvmopenmp.1
+OPENMP_MAN1SRCS=
 
 POLLY_MAN1SRCS= \
 	polly.1
diff --git a/devel/llvm-devel/files/patch-revert-6d7e428df611 b/devel/llvm-devel/files/patch-revert-6d7e428df611
deleted file mode 100644
index 07f556e9284c..000000000000
--- a/devel/llvm-devel/files/patch-revert-6d7e428df611
+++ /dev/null
@@ -1,17 +0,0 @@
---- compiler-rt/lib/builtins/CMakeLists.txt.orig
-+++ compiler-rt/lib/builtins/CMakeLists.txt
-@@ -867,12 +867,10 @@
-           endif()
-         endif()
-       endif()
--      check_c_source_compiles("_Float16 foo(_Float16 x) { return x; }
--                               int main(void) { return 0; }"
-+      check_c_source_compiles("_Float16 foo(_Float16 x) { return x; }"
-                               COMPILER_RT_HAS_${arch}_FLOAT16)
-       append_list_if(COMPILER_RT_HAS_${arch}_FLOAT16 -DCOMPILER_RT_HAS_FLOAT16 BUILTIN_CFLAGS_${arch})
--      check_c_source_compiles("__bf16 foo(__bf16 x) { return x; }
--                               int main(void) { return 0; }"
-+      check_c_source_compiles("__bf16 foo(__bf16 x) { return x; }"
-                               COMPILER_RT_HAS_${arch}_BFLOAT16)
-       # Build BF16 files only when "__bf16" is available.
-       if(COMPILER_RT_HAS_${arch}_BFLOAT16)
diff --git a/devel/llvm-devel/pkg-plist b/devel/llvm-devel/pkg-plist
index b28eb02d41ba..3dc34a5c1625 100644
--- a/devel/llvm-devel/pkg-plist
+++ b/devel/llvm-devel/pkg-plist
@@ -1684,7 +1684,6 @@ 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%%%%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
@@ -1920,9 +1919,8 @@ llvm-devel/bin/verify-uselistorder
 %%FLANG%%llvm-devel/include/flang/iso_fortran_env.mod
 %%FLANG%%llvm-devel/include/flang/iso_fortran_env_impl.mod
 %%FLANG%%llvm-devel/include/flang/mma.mod
-%%FLANG%%%%OPENMP%%llvm-devel/include/flang/omp_lib.f18.mod
+%%FLANG%%%%OPENMP%%llvm-devel/include/flang/omp_lib.h
 %%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