diff --git a/.gitignore b/.gitignore index 8831a6d..ea892c2 100644 --- a/.gitignore +++ b/.gitignore @@ -73,3 +73,5 @@ /openmp-13.0.0.src.tar.xz.sig /openmp-13.0.1.src.tar.xz /openmp-13.0.1.src.tar.xz.sig +/openmp-14.0.0.src.tar.xz.sig +/openmp-14.0.0.src.tar.xz diff --git a/0001-PATCH-openmp-CMake-Make-LIBOMP_HEADERS_INSTALL_PATH-.patch b/0001-PATCH-openmp-CMake-Make-LIBOMP_HEADERS_INSTALL_PATH-.patch index eedd1ee..e7febcf 100644 --- a/0001-PATCH-openmp-CMake-Make-LIBOMP_HEADERS_INSTALL_PATH-.patch +++ b/0001-PATCH-openmp-CMake-Make-LIBOMP_HEADERS_INSTALL_PATH-.patch @@ -13,11 +13,11 @@ diff --git a/openmp/runtime/src/CMakeLists.txt b/openmp/runtime/src/CMakeLists.t index 822f9ca..583a3c3 100644 --- a/openmp/runtime/src/CMakeLists.txt +++ b/openmp/runtime/src/CMakeLists.txt -@@ -305,7 +305,7 @@ add_dependencies(libomp-micro-tests libomp-test-deps) +@@ -346,7 +346,7 @@ add_dependencies(libomp-micro-tests libomp-test-deps) # We want to install libomp in DESTDIR/CMAKE_INSTALL_PREFIX/lib # We want to install headers in DESTDIR/CMAKE_INSTALL_PREFIX/include if(${OPENMP_STANDALONE_BUILD}) -- set(LIBOMP_HEADERS_INSTALL_PATH include) +- set(LIBOMP_HEADERS_INSTALL_PATH "${CMAKE_INSTALL_INCLUDEDIR}") + set(LIBOMP_HEADERS_INSTALL_PATH include CACHE PATH "Install path for OpenMP headers") else() string(REGEX MATCH "[0-9]+\\.[0-9]+(\\.[0-9]+)?" CLANG_VERSION ${PACKAGE_VERSION}) diff --git a/libomp.spec b/libomp.spec index 5800b42..c444da2 100644 --- a/libomp.spec +++ b/libomp.spec @@ -1,5 +1,5 @@ -%global libomp_version 13.0.1 -#global rc_ver 3 +%global libomp_version 14.0.0 +#global rc_ver 1 %global libomp_srcdir openmp-%{libomp_version}%{?rc_ver:rc%{rc_ver}}.src @@ -37,10 +37,6 @@ 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 @@ -131,11 +127,11 @@ rm -rf %{buildroot}%{_libdir}/libarcher_static.a %files %license LICENSE.TXT %{_libdir}/libomp.so +%{_libdir}/libompd.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 @@ -158,6 +154,9 @@ rm -rf %{buildroot}%{_libdir}/libarcher_static.a %{_libexecdir}/tests/libomp/ %changelog +* Mon Apr 25 2022 Timm Bäder - 14.0.0-1 +- 14.0.0 Release + * Thu Feb 03 2022 Tom Stellard - 13.0.1-1 - 13.0.1 Release diff --git a/sources b/sources index f7605d3..8c90a04 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (openmp-13.0.1.src.tar.xz) = cd12030b80825b25b5330ee2937a4e2074c99ba3689fa368206faafc05253ac27e0607260f0f1e15d5bafa880f9bee989496b554443ad4c6e7dc3de8d9973279 -SHA512 (openmp-13.0.1.src.tar.xz.sig) = d3f4539885819a7cd33caa561b7f2f77227280dd69172f4ba6a8fc5d6934973789062c7ab1dff60e9ef20caa95c9ea8f2f739c15082ec347664433ecaf43a0a2 +SHA512 (openmp-14.0.0.src.tar.xz.sig) = 3d8ace3bf76aad8832e6be2253d54b73bc358ea6ce44674a5cee84fcbc4bff4a6f10e3d1c9c47c57afe6ce3feb7e32f8208b2e017cf1c5b2b2ae20ef968790b9 +SHA512 (openmp-14.0.0.src.tar.xz) = 46009be377128d13ab8dfb6e7bedded4f0c34d00a47fc502f62d2519e5e3efb439b425a752e2e88750d4836ad2d11e8e1d275dd173de9b02d11d051b9934ac40