[packages/llvm] - updated to 22.1.5, fixed build with openmp-fortran

[qboosh]

commit 37d66acb2fc9a05a654bede58ce65972d8155ebd
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Tue May 19 19:29:32 2026 +0200

    - updated to 22.1.5, fixed build with openmp-fortran

 llvm-openmp-fortran.patch | 15 +++++++++++++++
 llvm.spec                 | 17 +++++++++--------
 2 files changed, 24 insertions(+), 8 deletions(-)
---
diff --git a/llvm.spec b/llvm.spec
index f767af9..2312e75 100644
--- a/llvm.spec
+++ b/llvm.spec
@@ -34,7 +34,7 @@
 %bcond_without	libclc			# libclc runtime
 %bcond_without	libcxx			# libcxx, libcxxabi, libunwind runtimes
 %bcond_without	openmp			# OpenMP runtime
-%bcond_with	openmp_fortran		# OpenMP Fortran modules (fails in 22.1.3)
+%bcond_without	openmp_fortran		# OpenMP Fortran modules (fails in 22.1.3)
 %bcond_without	ocaml			# OCaml binding
 %bcond_without	z3			# Z3 constraint solver support in Clang Static Analyzer
 %bcond_without	doc			# HTML docs and man pages
@@ -98,17 +98,18 @@
 Summary:	The Low Level Virtual Machine (An Optimizing Compiler Infrastructure)
 Summary(pl.UTF-8):	Niskopoziomowa maszyna wirtualna (infrastruktura kompilatora optymalizującego)
 Name:		llvm
-Version:	22.1.3
-Release:	4
+Version:	22.1.5
+Release:	1
 License:	Apache 2.0 with LLVM exceptions
 Group:		Development/Languages
 #Source0Download: https://github.com/llvm/llvm-project/releases/
 Source0:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/%{name}-project-%{version}.src.tar.xz
-# Source0-md5:	1b8f0fdca6f49e323702ed7d4da0feae
+# Source0-md5:	bbd2badbec6a8e8af83721444c2990d6
 Patch1:		%{name}-pld.patch
 Patch2:		%{name}-ocaml-link-dylib.patch
 Patch3:		x32-gcc-toolchain.patch
 Patch5:		%{name}-ocaml-shared.patch
+Patch6:		%{name}-openmp-fortran.patch
 Patch7:		llvm12-build_fixes.patch
 Patch8:		%{name}-selective_bindings.patch
 Patch9:		%{name}-libexecdir.patch
@@ -929,6 +930,7 @@ Obsługa GDB do LLVM OpenMP.
 %patch -P 2 -p1
 %patch -P 3 -p1
 %patch -P 5 -p1
+%patch -P 6 -p1
 %patch -P 7 -p1
 %patch -P 8 -p1
 %patch -P 9 -p1
@@ -1893,10 +1895,9 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with openmp_fortran}
 %files openmp-fortran-devel
 %defattr(644,root,root,755)
-# FIXME: in global includedir or clang's?
-%{_includedir}/omp_lib.h
-%{_includedir}/omp_lib.mod
-%{_includedir}/omp_lib_kinds.mod
+%{_libdir}/clang/%{major}/include/omp_lib.h
+%{_libdir}/clang/%{major}/include/omp_lib.mod
+%{_libdir}/clang/%{major}/include/omp_lib_kinds.mod
 %endif
 
 %files openmp-gdb
diff --git a/llvm-openmp-fortran.patch b/llvm-openmp-fortran.patch
new file mode 100644
index 0000000..d45a006
--- /dev/null
+++ b/llvm-openmp-fortran.patch
@@ -0,0 +1,15 @@
+This line causes:
+CMake Error at .../llvm-project-22.1.3.src/openmp/module/CMakeLists.txt:60 (set_property):
+  set_property DIRECTORY scope provided but requested directory was not
+  found.  This could be because the directory argument was invalid or, it is
+  valid but has not been processed yet.
+--- llvm-project-22.1.5.src/openmp/module/CMakeLists.txt.orig	2026-05-05 00:50:13.000000000 +0200
++++ llvm-project-22.1.5.src/openmp/module/CMakeLists.txt	2026-05-18 22:26:41.931190251 +0200
+@@ -57,7 +57,6 @@ elseif (LIBOMP_FORTRAN_MODULES)
+             ${LIBOMP_CONFIGURED_FFLAGS} ${LIBOMP_FORTRAN_SOURCE_FILE} "-J${CMAKE_CURRENT_BINARY_DIR}/../runtime/src"
+     DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/${LIBOMP_FORTRAN_SOURCE_FILE}"
+   )
+-  set_property(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../runtime/src" PROPERTY ADDITIONAL_MAKE_CLEAN_FILES "omp_lib${CMAKE_C_OUTPUT_EXTENSION}")
+   set(BUILD_FORTRAN_MODULES True)
+ endif ()
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/llvm.git/commitdiff/37d66acb2fc9a05a654bede58ce65972d8155ebd