Merge branch 'rawhide' of ssh://pkgs.fedoraproject.org/rpms/libomp into upstream-snapshot

This commit is contained in:
Tom Stellard 2023-04-17 18:05:51 +00:00
commit 36b4ed59f6
3 changed files with 44 additions and 116 deletions

104
.gitignore vendored
View file

@ -1,101 +1,3 @@
/openmp-5.0.0.src.tar.xz
/openmp-5.0.1.src.tar.xz
/openmp-6.0.0rc1.src.tar.xz
/openmp-6.0.0rc2.src.tar.xz
/openmp-6.0.0.src.tar.xz
/openmp-6.0.1rc1.src.tar.xz
/openmp-6.0.1.src.tar.xz
/openmp-7.0.0rc1.src.tar.xz
/openmp-7.0.0rc3.src.tar.xz
/openmp-7.0.0.src.tar.xz
/openmp-7.0.1.src.tar.xz
/openmp-8.0.0rc1.src.tar.xz
/openmp-8.0.0rc2.src.tar.xz
/openmp-8.0.0rc4.src.tar.xz
/openmp-8.0.0.src.tar.xz
/openmp-9.0.0rc3.src.tar.xz
/openmp-9.0.0.src.tar.xz
/openmp-9.0.1.src.tar.xz
/openmp-10.0.0rc1.src.tar.xz
/openmp-10.0.0rc1.src.tar.xz.sig
/openmp-10.0.0rc2.src.tar.xz
/openmp-10.0.0rc2.src.tar.xz.sig
/openmp-10.0.0rc3.src.tar.xz
/openmp-10.0.0rc3.src.tar.xz.sig
/openmp-10.0.0rc4.src.tar.xz
/openmp-10.0.0rc4.src.tar.xz.sig
/openmp-10.0.0rc5.src.tar.xz
/openmp-10.0.0rc5.src.tar.xz.sig
/openmp-10.0.0rc6.src.tar.xz
/openmp-10.0.0rc6.src.tar.xz.sig
/openmp-10.0.0.src.tar.xz
/openmp-10.0.0.src.tar.xz.sig
/openmp-11.0.0rc1.src.tar.xz.sig
/openmp-11.0.0rc1.src.tar.xz
/openmp-11.0.0rc2.src.tar.xz
/openmp-11.0.0rc2.src.tar.xz.sig
/libomp-10.0.0-0.3.rc3.fc33.src.rpm
/libomp-8.0.0-0.3.rc3.fc29.src.rpm
/openmp-11.0.0rc3.src.tar.xz
/openmp-11.0.0rc3.src.tar.xz.sig
/openmp-8.0.0rc3.src.tar.xz
/openmp-11.0.0rc5.src.tar.xz
/openmp-11.0.0rc5.src.tar.xz.sig
/openmp-11.0.0rc6.src.tar.xz
/openmp-11.0.0rc6.src.tar.xz.sig
/openmp-11.0.0.src.tar.xz
/openmp-11.0.0.src.tar.xz.sig
/openmp-11.0.1rc1.src.tar.xz
/openmp-11.0.1rc1.src.tar.xz.sig
/openmp-11.0.1rc2.src.tar.xz
/openmp-11.0.1rc2.src.tar.xz.sig
/openmp-11.0.1.src.tar.xz
/openmp-11.0.1.src.tar.xz.sig
/openmp-11.1.0rc1.src.tar.xz
/openmp-11.1.0rc1.src.tar.xz.sig
/openmp-11.1.0rc2.src.tar.xz
/openmp-11.1.0rc2.src.tar.xz.sig
/openmp-12.0.0rc1.src.tar.xz
/openmp-12.0.0rc1.src.tar.xz.sig
/openmp-12.0.0rc2.src.tar.xz
/openmp-12.0.0rc2.src.tar.xz.sig
/openmp-12.0.0rc3.src.tar.xz
/openmp-12.0.0rc3.src.tar.xz.sig
/openmp-12.0.0rc4.src.tar.xz
/openmp-12.0.0rc4.src.tar.xz.sig
/openmp-12.0.0rc5.src.tar.xz
/openmp-12.0.0rc5.src.tar.xz.sig
/openmp-12.0.0.src.tar.xz
/openmp-12.0.0.src.tar.xz.sig
/openmp-12.0.1rc1.src.tar.xz
/openmp-12.0.1rc1.src.tar.xz.sig
/openmp-12.0.1rc3.src.tar.xz
/openmp-12.0.1rc3.src.tar.xz.sig
/openmp-12.0.1.src.tar.xz
/openmp-12.0.1.src.tar.xz.sig
/openmp-13.0.0rc1.src.tar.xz
/openmp-13.0.0rc1.src.tar.xz.sig
/openmp-13.0.0rc3.src.tar.xz
/openmp-13.0.0rc3.src.tar.xz.sig
/openmp-13.0.0.src.tar.xz
/openmp-13.0.0.src.tar.xz.sig
/openmp-13.0.1rc1.src.tar.xz
/openmp-13.0.1rc1.src.tar.xz.sig
/openmp-13.0.1rc2.src.tar.xz
/openmp-13.0.1rc2.src.tar.xz.sig
/openmp-13.0.1rc3.src.tar.xz
/openmp-13.0.1rc3.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
/openmp-14.0.0.src.tar.xz.sig
/openmp-14.0.5.src.tar.xz
/openmp-14.0.5.src.tar.xz.sig
/openmp-15.0.0.src.tar.xz
/openmp-15.0.0.src.tar.xz.sig
/openmp-15.0.4.src.tar.xz
/openmp-15.0.4.src.tar.xz.sig
/openmp-15.0.6.src.tar.xz
/openmp-15.0.6.src.tar.xz.sig
/openmp-15.0.7.src.tar.xz
/openmp-15.0.7.src.tar.xz.sig
/*.tar.xz
/*.tar.xz.sig
/*.src.rpm

View file

@ -10,8 +10,8 @@
%global libomp_version %{llvm_snapshot_version}
%global so_suffix %{maj_ver}%{llvm_snapshot_version_suffix}
%else
%global maj_ver 15
%global libomp_version %{maj_ver}.0.7
%global maj_ver 16
%global libomp_version %{maj_ver}.0.1
%global so_suffix %{maj_ver}
#global rc_ver 3
%endif
@ -23,6 +23,7 @@
%undefine _include_frame_pointers
%global libomp_srcdir openmp-%{libomp_version}%{?rc_ver:rc%{rc_ver}}.src
%global cmake_srcdir cmake-%{libomp_version}%{?rc_ver:rc%{rc_ver}}.src
%ifarch ppc64le
%global libomp_arch ppc64
@ -39,11 +40,14 @@ License: Apache-2.0 WITH LLVM-exception OR NCSA
URL: http://openmp.llvm.org
%if %{with snapshot_build}
Source0: %{llvm_snapshot_source_prefix}openmp-%{llvm_snapshot_yyyymmdd}.src.tar.xz
Source5: %{llvm_snapshot_source_prefix}cmake-%{llvm_snapshot_yyyymmdd}.src.tar.xz
%{llvm_snapshot_extra_source_tags}
%else
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: release-keys.asc
Source5: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{libomp_version}%{?rc_ver:-rc%{rc_ver}}/%{cmake_srcdir}.tar.xz
Source6: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{libomp_version}%{?rc_ver:-rc%{rc_ver}}/%{cmake_srcdir}.tar.xz.sig
%endif
Source3: run-lit-tests
Source4: lit.fedora.cfg.py
@ -95,16 +99,22 @@ OpenMP regression tests
%prep
%if %{without snapshot_build}
%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE6}' --data='%{SOURCE5}'
%endif
%setup -T -q -b 5 -n %{cmake_srcdir}
# TODO: It would be more elegant to set -DLLVM_COMMON_CMAKE_UTILS=%{_builddir}/%{cmake_srcdir},
# but this is not a CACHED variable, so we can't actually set it externally :(
cd ..
mv %{cmake_srcdir} cmake
%autosetup -n %{libomp_srcdir} -p2
%build
# TODO: LIBOMP_HAVE_VERSION_SCRIPT_FLAG should be set automatically.
%cmake -GNinja \
-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 \
%if 0%{?__isa_bits} == 64
-DOPENMP_LIBDIR_SUFFIX=64 \
%else
@ -113,7 +123,8 @@ OpenMP regression tests
%if %{with snapshot_build}
-DLLVM_VERSION_SUFFIX="%{llvm_snapshot_version_suffix}" \
%endif
-DCMAKE_SKIP_RPATH:BOOL=ON
-DCMAKE_SKIP_RPATH:BOOL=ON \
-DLIBOMP_HAVE_VERSION_SCRIPT_FLAG:BOOL=ON
%cmake_build
@ -160,11 +171,8 @@ rm -rf %{buildroot}%{_libdir}/libarcher_static.a
%ifnarch %{arm}
%{_libdir}/libarcher.so
%endif
%ifnarch %{ix86}
%{_libdir}/libomptarget-amdgpu-gfx*.bc
%{_libdir}/libomptarget-nvptx-*.bc
%endif
%ifnarch %{ix86} %{arm}
# libomptarget is not supported on 32-bit systems.
%{_libdir}/libomptarget.rtl.amdgpu.so.%{so_suffix}
%{_libdir}/libomptarget.rtl.amdgpu.nextgen.so.%{so_suffix}
%{_libdir}/libomptarget.rtl.cuda.so.%{so_suffix}
@ -175,14 +183,15 @@ rm -rf %{buildroot}%{_libdir}/libarcher_static.a
%endif
%files devel
%{_libdir}/clang/%{libomp_version}/include/omp.h
%{_libdir}/clang/%{maj_ver}/include/omp.h
%{_libdir}/cmake/openmp/FindOpenMPTarget.cmake
%ifnarch %{arm}
%{_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
%endif
%ifnarch %{ix86} %{arm}
# libomptarget is not supported on 32-bit systems.
%{_libdir}/libomptarget.rtl.amdgpu.so
%{_libdir}/libomptarget.rtl.amdgpu.nextgen.so
%{_libdir}/libomptarget.rtl.cuda.so
@ -202,6 +211,21 @@ rm -rf %{buildroot}%{_libdir}/libarcher_static.a
%changelog
%{?llvm_snapshot_changelog_entry}
* Thu Apr 13 2023 Tulio Magno Quites Machado Filho <tuliom@redhat.com> - 16.0.1-1
- Update to LLVM 16.0.1
* Tue Mar 21 2023 Tulio Magno Quites Machado Filho <tuliom@redhat.com> - 16.0.0-1
- Update to LLVM 16.0.0
* Wed Mar 15 2023 Tulio Magno Quites Machado Filho <tuliom@redhat.com> - 16.0.0~rc4-1
- Update to LLVM 16.0.0 RC4
* Thu Feb 23 2023 Tulio Magno Quites Machado Filho <tuliom@redhat.com> - 16.0.0~rc3-1
- Update to LLVM 16.0.0 RC3
* Tue Feb 14 2023 Tulio Magno Quites Machado Filho <tuliom@redhat.com> - 16.0.0~rc1-1
- Update to LLVM 16.0.0 RC1
* Tue Jan 31 2023 Tulio Magno Quites Machado Filho <tuliom@redhat.com> - 15.0.7-5
- Include the Apache license adopted in 2019.

View file

@ -1,2 +1,4 @@
SHA512 (openmp-15.0.7.src.tar.xz) = b4f6399e33821776d9f58c8fb82ad2f3f266b2a38cf9ba1881fdac175c5a27e6d48e3c5e06bc8d42fb3a7dc350ec2e01b5d215ab851a27cb67c397ecfaebca89
SHA512 (openmp-15.0.7.src.tar.xz.sig) = 732a48656f58eadd005517255c656449d60e255900eb75df41d5cee4b1bbae66eac92428808bccafafeba77dead3c0247cd9eb9194ac3d0f5478e64f628a0106
SHA512 (cmake-16.0.1.src.tar.xz) = 7a0f01a82660a953e06b1df267918542205ac46f151d284dca74255c36fe5ccd995266638a85ce502a81cdd5e76ff3311e5f8488e09d0abbf22ee07cec186f5f
SHA512 (cmake-16.0.1.src.tar.xz.sig) = 8d49050e9b04df253a5bb2fa3b27796f204d085610432826bef6bb6cab876990d67e7fd5267fc89fadf21d88da73c535c82ae6ea0e1c867f7cd5efac244b0fa2
SHA512 (openmp-16.0.1.src.tar.xz) = 9c22ce1c7a2d12d266d5ce88d610d5bbbbf1da9ce9ad27be10f875ad238c5353b8cac7a64a84b7b0477387f3f60577eff49cde8b4521ab66509c9cd3d90c881f
SHA512 (openmp-16.0.1.src.tar.xz.sig) = b625b5a9394109bbb46763997914b0ba8bfe80b702c8685e7ffcec19126732a8cce7b959507682bacd6c5db3d4f6b6974cc9ba9daab68504058badd5fb1e305d