From 8188d9bb02732c44ff38a87e66070641c776947f Mon Sep 17 00:00:00 2001 From: Konrad Kleine Date: Wed, 15 May 2024 11:36:41 +0000 Subject: [PATCH] Remove OMP SOs The SOs are no longer installed since this commit: https://github.com/llvm/llvm-project/commit/fa9e90f5d23312587b3a17920941334e0d1a58a1 --- files.spec.inc | 10 ---------- globals.spec.inc | 3 +++ sources.spec.inc | 2 +- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/files.spec.inc b/files.spec.inc index dad9e31..1d5e9be 100644 --- a/files.spec.inc +++ b/files.spec.inc @@ -544,11 +544,6 @@ %ifnarch %{ix86} %{arm} # libomptarget is not supported on 32-bit systems. # s390x does not support the offloading plugins. -%ifnarch s390x -%{_libdir}/libomptarget.rtl.amdgpu.so.%{so_suffix} -%{_libdir}/libomptarget.rtl.cuda.so.%{so_suffix} -%{_libdir}/libomptarget.rtl.host.so.%{so_suffix} -%endif %{_libdir}/libomptarget.so.%{so_suffix} %endif @@ -565,11 +560,6 @@ %ifnarch %{ix86} %{arm} # libomptarget is not supported on 32-bit systems. # s390x does not support the offloading plugins. -%ifnarch s390x -%{_libdir}/libomptarget.rtl.amdgpu.so -%{_libdir}/libomptarget.rtl.cuda.so -%{_libdir}/libomptarget.rtl.host.so -%endif %{_libdir}/libomptarget.devicertl.a %{_libdir}/libomptarget-amdgpu-*.bc %{_libdir}/libomptarget-nvptx-*.bc diff --git a/globals.spec.inc b/globals.spec.inc index c00e419..d0ac14f 100644 --- a/globals.spec.inc +++ b/globals.spec.inc @@ -19,6 +19,9 @@ # Suffixless tarball name (essentially: basename -s .tar.xz llvm-project-17.0.6.src.tar.xz) %global src_tarball_dir llvm-project-%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:rc%{rc_ver}}.src +%if %{with snapshot_build} +%global src_tarball_dir llvm-project-%{llvm_snapshot_git_revision} +%endif %global _lto_cflags -flto=thin diff --git a/sources.spec.inc b/sources.spec.inc index c8748c6..da180e0 100644 --- a/sources.spec.inc +++ b/sources.spec.inc @@ -1,5 +1,5 @@ %if %{with snapshot_build} -Source0: %{llvm_snapshot_source_prefix}llvm-project-%{llvm_snapshot_yyyymmdd}.src.tar.xz +Source0: https://github.com/llvm/llvm-project/archive/%{llvm_snapshot_git_revision}.tar.gz %else Source0: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:-rc%{rc_ver}}/%{src_tarball_dir}.tar.xz Source1001: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:-rc%{rc_ver}}/%{src_tarball_dir}.tar.xz.sig