From e30affbe864634d404b35ecb15f94e3c66024e5c Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar@redhat.com>
Date: Sat, 16 Mar 2024 20:09:57 +0000
Subject: [PATCH] Sync with openmp upstream-snapshot branch

---
 build.spec.inc   | 3 +++
 globals.spec.inc | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/build.spec.inc b/build.spec.inc
index ec7970b..ef9d45d 100644
--- a/build.spec.inc
+++ b/build.spec.inc
@@ -45,6 +45,8 @@ cd llvm
 # force off shared libs as cmake macros turns it on.
 # TODO: Disable LLVM_UNREACHABLE_OPTIMIZE.
 # TODO: LIBOMP_HAVE_VERSION_SCRIPT_FLAG should be set automatically.
+# TODO: Override LIBOMP_INSTALL_LIBDIR, because otherwise the libraries
+# are installed to /usr/lib64/$TRIPLE and clang can't find them.
 %cmake	-G Ninja \
 	-DLLVM_ENABLE_PROJECTS="clang;clang-tools-extra" \
 	\
@@ -110,6 +112,7 @@ cd llvm
 	-DOPENMP_LIBDIR_SUFFIX= \
 %endif
 %endif
+	-DOPENMP_INSTALL_LIBDIR=%{_lib} \
 	\
 	\
 	\
diff --git a/globals.spec.inc b/globals.spec.inc
index 4e4e2b0..36aa366 100644
--- a/globals.spec.inc
+++ b/globals.spec.inc
@@ -119,10 +119,10 @@
 
 %global pkg_name_libomp libomp
 
-%global so_suffix %{maj_ver}
+%global so_suffix %{maj_ver}.%{min_ver}
 
 %if %{with snapshot_build}
-%global so_suffix %{maj_ver}%{llvm_snapshot_version_suffix}
+%global so_suffix %{maj_ver}.%{min_ver}%{llvm_snapshot_version_suffix}
 %endif
 
 %ifarch ppc64le