diff --git a/.gitignore b/.gitignore index edea605..d62ef01 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/openmp-13.0.1.src.tar.xz +SOURCES/openmp-14.0.6.src.tar.xz SOURCES/tstellar-gpg-key.asc diff --git a/.libomp.metadata b/.libomp.metadata index e9a4c02..3801658 100644 --- a/.libomp.metadata +++ b/.libomp.metadata @@ -1,2 +1,2 @@ -a5b883a2fbdc14ec44277cc9cc0f6592d80663e4 SOURCES/openmp-13.0.1.src.tar.xz +647f1db43c1bb3b8b7c947dd54a1c3d247685d68 SOURCES/openmp-14.0.6.src.tar.xz b8d2648a01d36ed0186fd2c5af325fd28797f9a0 SOURCES/tstellar-gpg-key.asc diff --git a/SOURCES/0001-PATCH-openmp-CMake-Make-LIBOMP_HEADERS_INSTALL_PATH-.patch b/SOURCES/0001-PATCH-openmp-CMake-Make-LIBOMP_HEADERS_INSTALL_PATH-.patch index eedd1ee..e7febcf 100644 --- a/SOURCES/0001-PATCH-openmp-CMake-Make-LIBOMP_HEADERS_INSTALL_PATH-.patch +++ b/SOURCES/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/SOURCES/openmp-13.0.1.src.tar.xz.sig b/SOURCES/openmp-13.0.1.src.tar.xz.sig deleted file mode 100644 index cc29713..0000000 Binary files a/SOURCES/openmp-13.0.1.src.tar.xz.sig and /dev/null differ diff --git a/SOURCES/openmp-14.0.6.src.tar.xz.sig b/SOURCES/openmp-14.0.6.src.tar.xz.sig new file mode 100644 index 0000000..77f81a1 Binary files /dev/null and b/SOURCES/openmp-14.0.6.src.tar.xz.sig differ diff --git a/SPECS/libomp.spec b/SPECS/libomp.spec index 5800b42..53a2d46 100644 --- a/SPECS/libomp.spec +++ b/SPECS/libomp.spec @@ -1,5 +1,5 @@ -%global libomp_version 13.0.1 -#global rc_ver 3 +%global libomp_version 14.0.6 +#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,15 @@ rm -rf %{buildroot}%{_libdir}/libarcher_static.a %{_libexecdir}/tests/libomp/ %changelog +* Wed Jul 20 2022 Timm Bäder - 14.0.6-1 +- 14.0.6 Release + +* Tue Jun 21 2022 Timm Bäder - 14.0.5-1 +- 14.0.5 Release + +* 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