diff --git a/.gitignore b/.gitignore index 6c2b3f1..edea605 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/openmp-12.0.1.src.tar.xz +SOURCES/openmp-13.0.1.src.tar.xz SOURCES/tstellar-gpg-key.asc diff --git a/.libomp.metadata b/.libomp.metadata index 3caeb77..e9a4c02 100644 --- a/.libomp.metadata +++ b/.libomp.metadata @@ -1,2 +1,2 @@ -7c051f6050ff23763b253a757927774b5eeaf644 SOURCES/openmp-12.0.1.src.tar.xz +a5b883a2fbdc14ec44277cc9cc0f6592d80663e4 SOURCES/openmp-13.0.1.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.1.src.tar.xz.sig b/SOURCES/openmp-13.0.1.src.tar.xz.sig new file mode 100644 index 0000000..cc29713 Binary files /dev/null and b/SOURCES/openmp-13.0.1.src.tar.xz.sig differ diff --git a/SPECS/libomp.spec b/SPECS/libomp.spec index 0f40bd4..90a13c7 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.1 +#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}} +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 @@ -32,6 +33,14 @@ BuildRequires: perl BuildRequires: perl-Data-Dumper BuildRequires: perl-Encode BuildRequires: libffi-devel +BuildRequires: ncurses-devel + +# 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} @@ -66,6 +75,7 @@ OpenMP regression tests %build # LTO causes build failures in this package. Disable LTO for now +# https://bugzilla.redhat.com/show_bug.cgi?id=1988155 %define _lto_cflags %{nil} mkdir -p %{_vpath_builddir} @@ -73,7 +83,8 @@ cd %{_vpath_builddir} %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 @@ -119,17 +130,25 @@ cd %{_vpath_builddir} %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 +159,12 @@ cd %{_vpath_builddir} %{_libexecdir}/tests/libomp/ %changelog +* Thu Feb 03 2022 Tom Stellard - 13.0.1-1 +- 13.0.1 Release + +* Fri Oct 15 2021 Tom Stellard - 13.0.0-1 +- 13.0.0 Release + * Fri Jul 16 2021 sguelton@redhat.com - 12.0.1-1 - 12.0.1 release