From 9cb640564194c8ddc6841d7725f4919b6641dcf0 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Dec 07 2021 17:19:08 +0000 Subject: import libomp-13.0.0-1.el9 --- diff --git a/.gitignore b/.gitignore index 6c2b3f1..948a604 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/openmp-12.0.1.src.tar.xz +SOURCES/openmp-13.0.0.src.tar.xz SOURCES/tstellar-gpg-key.asc diff --git a/.libomp.metadata b/.libomp.metadata index 3caeb77..8e7e6f6 100644 --- a/.libomp.metadata +++ b/.libomp.metadata @@ -1,2 +1,2 @@ -7c051f6050ff23763b253a757927774b5eeaf644 SOURCES/openmp-12.0.1.src.tar.xz +8bec3e9afd374e97e4b83212a0ab681ae329f337 SOURCES/openmp-13.0.0.src.tar.xz b8d2648a01d36ed0186fd2c5af325fd28797f9a0 SOURCES/tstellar-gpg-key.asc diff --git a/SOURCES/openmp-12.0.1.src.tar.xz.sig b/SOURCES/openmp-12.0.1.src.tar.xz.sig deleted file mode 100644 index b20d821..0000000 Binary files a/SOURCES/openmp-12.0.1.src.tar.xz.sig and /dev/null differ diff --git a/SOURCES/openmp-13.0.0.src.tar.xz.sig b/SOURCES/openmp-13.0.0.src.tar.xz.sig new file mode 100644 index 0000000..7cdf200 Binary files /dev/null and b/SOURCES/openmp-13.0.0.src.tar.xz.sig differ diff --git a/SPECS/libomp.spec b/SPECS/libomp.spec index bbcc792..8a00719 100644 --- a/SPECS/libomp.spec +++ b/SPECS/libomp.spec @@ -1,5 +1,6 @@ -#%%global rc_ver 5 -%global libomp_srcdir openmp-%{version}%{?rc_ver:rc%{rc_ver}}.src +%global libomp_version 13.0.0 +#global rc_ver 3 +%global libomp_srcdir openmp-%{libomp_version}%{?rc_ver:rc%{rc_ver}}.src %ifarch ppc64le @@ -9,14 +10,14 @@ %endif Name: libomp -Version: 12.0.1%{?rc_ver:~rc%{rc_ver}} -Release: 2%{?dist} +Version: %{libomp_version}%{?rc_ver:~rc%{rc_ver}} +Release: 1%{?dist} Summary: OpenMP runtime for clang License: NCSA URL: http://openmp.llvm.org -Source0: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}%{?rc_ver:-rc%{rc_ver}}/%{libomp_srcdir}.tar.xz -Source1: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}%{?rc_ver:-rc%{rc_ver}}/%{libomp_srcdir}.tar.xz.sig +Source0: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{libomp_version}%{?rc_ver:-rc%{rc_ver}}/%{libomp_srcdir}.tar.xz +Source1: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{libomp_version}%{?rc_ver:-rc%{rc_ver}}/%{libomp_srcdir}.tar.xz.sig Source2: tstellar-gpg-key.asc Source3: run-lit-tests Source4: lit.fedora.cfg.py @@ -36,6 +37,13 @@ BuildRequires: libffi-devel # For gpg source verification BuildRequires: gnupg2 +# The AMDGCN device RTL requires clang and llvm-link to build +BuildRequires: clang +BuildRequires: llvm + +# libomptarget needs the llvm cmake files +BuildRequires: llvm-devel + Requires: elfutils-libelf%{?isa} # libomp does not support s390x. @@ -75,12 +83,14 @@ OpenMP regression tests %cmake -GNinja \ -DLIBOMP_INSTALL_ALIASES=OFF \ - -DLIBOMP_HEADERS_INSTALL_PATH:PATH=%{_libdir}/clang/%{version}/include \ + -DLLVM_DIR=%{_libdir}/cmake/llvm \ + -DLIBOMP_HEADERS_INSTALL_PATH:PATH=%{_libdir}/clang/%{libomp_version}/include \ %if 0%{?__isa_bits} == 64 -DOPENMP_LIBDIR_SUFFIX=64 \ %else -DOPENMP_LIBDIR_SUFFIX= \ %endif + -DCMAKE_SKIP_RPATH:BOOL=ON %cmake_build @@ -119,17 +129,25 @@ rm -rf %{buildroot}%{_libdir}/libarcher_static.a %cmake_build --target check-openmp %files -%license LICENSE.txt +%license LICENSE.TXT %{_libdir}/libomp.so %ifnarch %{arm} %{_libdir}/libarcher.so %endif +%ifnarch %{ix86} %{arm} +%{_libdir}/libomptarget-amdgcn*.bc +%{_libdir}/libomptarget.rtl.amdgpu.so +%{_libdir}/libomptarget.rtl.cuda.so +%{_libdir}/libomptarget.rtl.%{libomp_arch}.so +%endif +%{_libdir}/libomptarget.so %files devel -%{_libdir}/clang/%{version}/include/omp.h +%{_libdir}/clang/%{libomp_version}/include/omp.h +%{_libdir}/cmake/openmp/FindOpenMPTarget.cmake %ifnarch %{arm} -%{_libdir}/clang/%{version}/include/omp-tools.h -%{_libdir}/clang/%{version}/include/ompt.h +%{_libdir}/clang/%{libomp_version}/include/omp-tools.h +%{_libdir}/clang/%{libomp_version}/include/ompt.h # FIXME: This is probably wrong. Seems like LIBOMP_HEADERS_INSTALL may # not be respected. %{_includedir}/ompt-multiplex.h @@ -140,6 +158,9 @@ rm -rf %{buildroot}%{_libdir}/libarcher_static.a %{_libexecdir}/tests/libomp/ %changelog +* Tue Oct 12 2021 Timm Bäder 13.0.0-1 +- Release 13.0.0 + * Mon Aug 09 2021 Mohan Boddu - 12.0.1-2 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags Related: rhbz#1991688