diff --git a/0001-libomp-Explicitly-include-string-header-NFC.patch b/0001-libomp-Explicitly-include-string-header-NFC.patch deleted file mode 100644 index 775002e6692031af530ecd785b0ad873b055e648..0000000000000000000000000000000000000000 --- a/0001-libomp-Explicitly-include-string-header-NFC.patch +++ /dev/null @@ -1,26 +0,0 @@ -From f2ddf903f588021507faefec15d360edb1e425e5 Mon Sep 17 00:00:00 2001 -From: Nikita Popov -Date: Fri, 20 Jan 2023 10:11:01 +0100 -Subject: [PATCH] [libomp] Explicitly include header (NFC) - -This is required to build against libstdc++ 13. Debug.h uses -std::stoi() from without explicitly including it. ---- - openmp/libomptarget/include/Debug.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/openmp/libomptarget/include/Debug.h b/openmp/libomptarget/include/Debug.h -index 4e7da8b7d53f..387dfe50659e 100644 ---- a/openmp/libomptarget/include/Debug.h -+++ b/openmp/libomptarget/include/Debug.h -@@ -39,6 +39,7 @@ - - #include - #include -+#include - - /// 32-Bit field data attributes controlling information presented to the user. - enum OpenMPInfoType : uint32_t { --- -2.39.0 - diff --git a/cmake-16.0.1.src.tar.xz b/cmake-16.0.1.src.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..ee563132336eac9571bda9c89e77153ecee46e8c Binary files /dev/null and b/cmake-16.0.1.src.tar.xz differ diff --git a/libomp.spec b/libomp.spec index aed93b9e9887ed68000dc38471d68cd280021c16..21648f0fda2fb084e6aae18514a876667f7d7858 100644 --- a/libomp.spec +++ b/libomp.spec @@ -3,9 +3,10 @@ %undefine _include_frame_pointers -%global maj_ver 15 -%global libomp_version %{maj_ver}.0.7 +%global maj_ver 16 +%global libomp_version %{maj_ver}.0.1 %global libomp_srcdir openmp-%{libomp_version}.src +%global cmake_srcdir cmake-%{libomp_version}.src %global libomp_arch %{_arch} @@ -19,9 +20,7 @@ URL: http://openmp.llvm.org Source0: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{libomp_version}/%{libomp_srcdir}.tar.xz Source3: run-lit-tests Source4: lit.distro.cfg.py - -# TODO: Not needed with LLVM 16. -Patch1: 0001-libomp-Explicitly-include-string-header-NFC.patch +Source5: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{libomp_version}/%{cmake_srcdir}.tar.xz BuildRequires: clang # For clang-offload-packager @@ -32,7 +31,9 @@ BuildRequires: elfutils-libelf-devel BuildRequires: perl BuildRequires: perl-Data-Dumper BuildRequires: perl-Encode +BuildRequires: perl-FindBin BuildRequires: libffi-devel +BuildRequires: libxml2-devel # libomptarget needs the llvm cmake files BuildRequires: llvm-devel @@ -62,6 +63,9 @@ Requires: python3-lit OpenMP regression tests %prep +%setup -T -q -b 5 -n %{cmake_srcdir} +cd .. +mv %{cmake_srcdir} cmake %autosetup -n %{libomp_srcdir} -p2 %build @@ -70,9 +74,10 @@ OpenMP regression tests -DLIBOMP_INSTALL_ALIASES=OFF \ -DCMAKE_MODULE_PATH=%{_libdir}/cmake/llvm \ -DLLVM_DIR=%{_libdir}/cmake/llvm \ - -DCMAKE_INSTALL_INCLUDEDIR=%{_libdir}/clang/%{libomp_version}/include \ + -DCMAKE_INSTALL_INCLUDEDIR=%{_libdir}/clang/%{maj_ver}/include \ -DOPENMP_LIBDIR_SUFFIX=64 \ - -DCMAKE_SKIP_RPATH:BOOL=ON + -DCMAKE_SKIP_RPATH:BOOL=ON \ + -DLIBOMP_HAVE_VERSION_SCRIPT_FLAG:BOOL=ON %cmake_build @@ -116,19 +121,25 @@ rm -rf %{buildroot}%{_libdir}/libarcher_static.a %{_libdir}/libompd.so %{_libdir}/libarcher.so %{_libdir}/libomptarget.rtl.amdgpu.so.%{maj_ver} +%{_libdir}/libomptarget.rtl.amdgpu.nextgen.so.%{maj_ver} %{_libdir}/libomptarget.rtl.cuda.so.%{maj_ver} +%{_libdir}/libomptarget.rtl.cuda.nextgen.so.%{maj_ver} %{_libdir}/libomptarget.rtl.%{libomp_arch}.so.%{maj_ver} +%{_libdir}/libomptarget.rtl.%{libomp_arch}.nextgen.so.%{maj_ver} %{_libdir}/libomptarget.so.%{maj_ver} %files devel -%{_libdir}/clang/%{libomp_version}/include/omp.h +%{_libdir}/clang/%{maj_ver}/include/omp.h %{_libdir}/cmake/openmp/FindOpenMPTarget.cmake -%{_libdir}/clang/%{libomp_version}/include/omp-tools.h -%{_libdir}/clang/%{libomp_version}/include/ompt.h -%{_libdir}/clang/%{libomp_version}/include/ompt-multiplex.h +%{_libdir}/clang/%{maj_ver}/include/omp-tools.h +%{_libdir}/clang/%{maj_ver}/include/ompt.h +%{_libdir}/clang/%{maj_ver}/include/ompt-multiplex.h %{_libdir}/libomptarget.rtl.amdgpu.so +%{_libdir}/libomptarget.rtl.amdgpu.nextgen.so %{_libdir}/libomptarget.rtl.cuda.so +%{_libdir}/libomptarget.rtl.cuda.nextgen.so %{_libdir}/libomptarget.rtl.%{libomp_arch}.so +%{_libdir}/libomptarget.rtl.%{libomp_arch}.nextgen.so %{_libdir}/libomptarget.devicertl.a %{_libdir}/libomptarget-amdgpu-*.bc %{_libdir}/libomptarget-nvptx-*.bc @@ -139,5 +150,8 @@ rm -rf %{buildroot}%{_libdir}/libarcher_static.a %{_libexecdir}/tests/libomp/ %changelog +* Fri Apr 14 2023 Funda Wang - 16.0.1-1 +- New version 16.0.1 + * Wed Feb 1 2023 Funda Wang - 15.0.7-1 - Import package for anolis 23 diff --git a/openmp-15.0.7.src.tar.xz b/openmp-15.0.7.src.tar.xz deleted file mode 100644 index 636471de60579c4a45952548fa9807d7fb7cfa99..0000000000000000000000000000000000000000 Binary files a/openmp-15.0.7.src.tar.xz and /dev/null differ diff --git a/openmp-16.0.1.src.tar.xz b/openmp-16.0.1.src.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..ac15ea6ddacc4fd1aa6edcc6a77c5f2547ba482c Binary files /dev/null and b/openmp-16.0.1.src.tar.xz differ