diff --git a/.gitignore b/.gitignore index 45b7014..1e9ef17 100644 --- a/.gitignore +++ b/.gitignore @@ -69,3 +69,5 @@ /openmp-12.0.0.src.tar.xz.sig /openmp-12.0.1.src.tar.xz /openmp-12.0.1.src.tar.xz.sig +/openmp-13.0.0.src.tar.xz +/openmp-13.0.0.src.tar.xz.sig diff --git a/libomp.spec b/libomp.spec index bbcc792..8a00719 100644 --- a/libomp.spec +++ b/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 diff --git a/sources b/sources index 1f10a91..05696a9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (openmp-12.0.1.src.tar.xz) = 554edf032995cf80cfb6c878b26510b6c4df09e6bd4813934ea523ff8e121900a91ec59c3d83ee0ba390fb83bcaf6d137f7f6019958b444bdfe6a2b35c1c8d08 -SHA512 (openmp-12.0.1.src.tar.xz.sig) = 1e92ec1421f5bd4d7be0b3d5e62c21bdf2f79daccfd2713595cb4764fb67bfd4c40a2ea5c2a9fd33c8439a86fa862e6684b75134b57c3a53a7e582338530733e +SHA512 (openmp-13.0.0.src.tar.xz) = 087793f469a18b1271f433ff7e4f26b444d5cdefeb1d65d0be0492d3f4096d4f4b2caf6621b0af8a5699552e769c51634ed2b7dc223bd74ff0dc9ae749bdaae7 +SHA512 (openmp-13.0.0.src.tar.xz.sig) = dff99606211a5988a95f7b1d564947d591e41acb34be79a70e8ed5ee2aad4236a3b5626c416b806c836d53a641dff41eb480253e1bfea9fd7f367c4052e50c82