From cb8eb089675b01c2b0891052cf82de0ef5c0d6e3 Mon Sep 17 00:00:00 2001 From: James Antill Date: Thu, 23 Feb 2023 12:51:56 -0500 Subject: [PATCH] Import rpm: 84b4fd4e5e955f96050ca2705c3f21c1fc593cd1 --- .gitignore | 4 +- libomp.spec | 73 ++++++++++++++++++++++++----------- openmp-15.0.7.src.tar.xz.sig | Bin 0 -> 566 bytes sources | 4 +- 4 files changed, 55 insertions(+), 26 deletions(-) create mode 100644 openmp-15.0.7.src.tar.xz.sig diff --git a/.gitignore b/.gitignore index e7ab436..5bfb61d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/openmp-14.0.0.src.tar.xz -SOURCES/tstellar-gpg-key.asc +SOURCES/openmp-15.0.7.src.tar.xz +SOURCES/release-keys.asc diff --git a/libomp.spec b/libomp.spec index a72dfaa..5fc82e5 100644 --- a/libomp.spec +++ b/libomp.spec @@ -1,4 +1,5 @@ -%global libomp_version 14.0.0 +%global maj_ver 15 +%global libomp_version %{maj_ver}.0.7 #global rc_ver 1 %global libomp_srcdir openmp-%{libomp_version}%{?rc_ver:rc%{rc_ver}}.src @@ -9,29 +10,28 @@ %global libomp_arch %{_arch} %endif +%ifarch %{ix86} +%bcond_with testpkg +%else +%bcond_without testpkg +%endif + Name: libomp Version: %{libomp_version}%{?rc_ver:~rc%{rc_ver}} -Release: 2%{?dist} +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-%{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 +Source2: release-keys.asc Source3: run-lit-tests Source4: lit.fedora.cfg.py -Patch0: 0001-PATCH-openmp-CMake-Make-LIBOMP_HEADERS_INSTALL_PATH-.patch -# RHEL specific: Workaround for a bug in GCC that breaks compiling -# the kmp_lock.cpp. Without this patch, GCC errors out with -# ../runtime/src/kmp_lock.cpp:2684:1: error: unsupported size for integer register -Patch1: gcc-workaround.patch -# https://github.com/llvm/llvm-project/commit/40d3a0ba4d9e5452c0a68cfdaa8e88eb8ed5c63d -Patch2: fix-strict-aliasing-issue-in-cmpxchg-routine.patch - -BuildRequires: gcc -BuildRequires: gcc-c++ +BuildRequires: clang +# For clang-offload-packager +BuildRequires: clang-tools-extra BuildRequires: cmake BuildRequires: ninja-build BuildRequires: elfutils-libelf-devel @@ -64,6 +64,8 @@ Requires: clang-resource-filesystem%{?isa} = %{version} %description devel OpenMP header files. +%if %{with testpkg} + %package test Summary: OpenMP regression tests Requires: %{name}%{?isa} = %{version}-%{release} @@ -77,6 +79,8 @@ Requires: python3-lit %description test OpenMP regression tests +%endif + %prep %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' %autosetup -n %{libomp_srcdir} -p2 @@ -91,8 +95,9 @@ cd %{_vpath_builddir} %cmake .. -GNinja \ -DLIBOMP_INSTALL_ALIASES=OFF \ + -DCMAKE_MODULE_PATH=%{_libdir}/cmake/llvm \ -DLLVM_DIR=%{_libdir}/cmake/llvm \ - -DLIBOMP_HEADERS_INSTALL_PATH:PATH=%{_libdir}/clang/%{libomp_version}/include \ + -DCMAKE_INSTALL_INCLUDEDIR=%{_libdir}/clang/%{libomp_version}/include \ %if 0%{?__isa_bits} == 64 -DOPENMP_LIBDIR_SUFFIX=64 \ %else @@ -107,6 +112,7 @@ cd %{_vpath_builddir} cd %{_vpath_builddir} %cmake_install +%if %{with testpkg} # Test package setup %global libomp_srcdir %{_datadir}/libomp/src/ %global libomp_testdir %{libomp_srcdir}/runtime/test/ @@ -131,12 +137,14 @@ echo "lit_config.load_config(config, '%{lit_fedora_cfg}')" >> %{buildroot}%{lit_ install -d %{buildroot}%{_libexecdir}/tests/libomp install -m 0755 %{SOURCE3} %{buildroot}%{_libexecdir}/tests/libomp +%endif + # Remove static libraries with equivalent shared libraries rm -rf %{buildroot}%{_libdir}/libarcher_static.a %check cd %{_vpath_builddir} -%cmake_build --target check-openmp +%cmake_build --target check-openmp || true %files %license LICENSE.TXT @@ -146,11 +154,11 @@ cd %{_vpath_builddir} %{_libdir}/libarcher.so %endif %ifnarch %{ix86} %{arm} -%{_libdir}/libomptarget.rtl.amdgpu.so -%{_libdir}/libomptarget.rtl.cuda.so -%{_libdir}/libomptarget.rtl.%{libomp_arch}.so +%{_libdir}/libomptarget.rtl.amdgpu.so.%{maj_ver} +%{_libdir}/libomptarget.rtl.cuda.so.%{maj_ver} +%{_libdir}/libomptarget.rtl.%{libomp_arch}.so.%{maj_ver} %endif -%{_libdir}/libomptarget.so +%{_libdir}/libomptarget.so.%{maj_ver} %files devel %{_libdir}/clang/%{libomp_version}/include/omp.h @@ -158,16 +166,37 @@ cd %{_vpath_builddir} %ifnarch %{arm} %{_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 +%{_libdir}/clang/%{libomp_version}/include/ompt-multiplex.h %endif +%ifnarch %{ix86} %{arm} +%{_libdir}/libomptarget.rtl.amdgpu.so +%{_libdir}/libomptarget.rtl.cuda.so +%{_libdir}/libomptarget.rtl.%{libomp_arch}.so +%{_libdir}/libomptarget.devicertl.a +%{_libdir}/libomptarget-amdgpu-*.bc +%{_libdir}/libomptarget-nvptx-*.bc +%endif +%{_libdir}/libomptarget.so +%if %{with testpkg} %files test %{_datadir}/libomp %{_libexecdir}/tests/libomp/ +%endif %changelog +* Thu Jan 19 2023 Tom Stellard - 15.0.7-1 +- Update to LLVM 15.0.7 + +* Tue Sep 06 2022 Nikita Popov - 15.0.0-1 +- Update to LLVM 15.0.0 + +* Wed Aug 10 2022 Tom Stellard - 14.0.6-2 +- Drop -test sub-package on i686 + +* Tue Jun 28 2022 Tom Stellard - 14.0.6-1 +- 14.0.6 Release + * Wed May 18 2022 Timm Bäder - 14.00-2 - Backport 40d3a0ba4d9e5452c0a68cfdaa8e88eb8ed5c63d to fix a strict aliasing issue. diff --git a/openmp-15.0.7.src.tar.xz.sig b/openmp-15.0.7.src.tar.xz.sig new file mode 100644 index 0000000000000000000000000000000000000000..731d3acba80d6baca3728a3fccea493cde03583a GIT binary patch literal 566 zcmV-60?GY}0y6{v0SEvc79j*jP9iaCzek0rjBbvi$CRmtL7j>P0%O0rLI4U05TeJF zsfIzFio1*t|8UFAlGr}qZLE9gtrGRzZDc55B;Ctu zB>klcbXD4#&nsUQuQ@s&^@X9}Xhms%K~(X9wEI6_)ihrLC3S$=<5Nwlb0e7fOcZM> zD;Pt_HZ7buW@bqsA$V5fHJ;()(gN%sHOt@pM>*rPjMuuDTn}x4?M(MZfhosA>vU-u zkJ!M4T%zRilkrhKwL?;Gs{y_@E8Pq<)JL$%jR{*#fH#G}>9h!EpzzD(FwNVhGYD_Q z6w3BV+WLlj?ypvth2=04q*`>mHO-uR2?9DbI4_`*!UbY`&iEy?@&qgCg_qpOouT{K#T-?)2=bhfU4xZH^-A2P^wDZTxv&w z@+US3{P}6PeeJv*h8t}Q7O9Aqqmpw}SVWhmj!y*Z%tqJM