Import rpm: 84b4fd4e5e955f96050ca2705c3f21c1fc593cd1

This commit is contained in:
James Antill 2023-02-23 12:51:56 -05:00
parent 811b8abfaa
commit cb8eb08967
4 changed files with 55 additions and 26 deletions

4
.gitignore vendored
View File

@ -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

View File

@ -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 <tstellar@redhat.com> - 15.0.7-1
- Update to LLVM 15.0.7
* Tue Sep 06 2022 Nikita Popov <npopov@redhat.com> - 15.0.0-1
- Update to LLVM 15.0.0
* Wed Aug 10 2022 Tom Stellard <tstellar@redhat.com> - 14.0.6-2
- Drop -test sub-package on i686
* Tue Jun 28 2022 Tom Stellard <tstellar@redhat.com> - 14.0.6-1
- 14.0.6 Release
* Wed May 18 2022 Timm Bäder <tbaeder@redhat.com> - 14.00-2
- Backport 40d3a0ba4d9e5452c0a68cfdaa8e88eb8ed5c63d to
fix a strict aliasing issue.

Binary file not shown.

View File

@ -1,2 +1,2 @@
SHA512 (openmp-14.0.0.src.tar.xz) = 46009be377128d13ab8dfb6e7bedded4f0c34d00a47fc502f62d2519e5e3efb439b425a752e2e88750d4836ad2d11e8e1d275dd173de9b02d11d051b9934ac40
SHA512 (tstellar-gpg-key.asc) = a6720905008fab485d24263c4a65b0b379636a2dfa38e14bbcd2cc9a48afb9f66afe179f5f455c49902512ddb76517afd456a2c02d942fec1a2d764142834f4d
SHA1 (openmp-15.0.7.src.tar.xz) = d8a0b4314a65a4ad3a82fbcbc59876cfcf09c95b
SHA1 (release-keys.asc) = 347bdd5ee6d6b93c9644c268511815912c0fb2dc