rpms/compiler-rt
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Use llvm-cmake-utils package

Browse Source
This commit is contained in:
Nikita Popov 2023-06-15 15:16:30 +02:00
parent 1291dd7b82
commit 53c9478c36
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
compiler-rt.spec
View File

@ -11,7 +11,6 @@
%global compiler_rt_version %{maj_ver}.%{min_ver}.%{patch_ver} %global compiler_rt_version %{maj_ver}.%{min_ver}.%{patch_ver}
%global crt_srcdir compiler-rt-%{compiler_rt_version}%{?rc_ver:rc%{rc_ver}}.src %global crt_srcdir compiler-rt-%{compiler_rt_version}%{?rc_ver:rc%{rc_ver}}.src
%global cmake_srcdir cmake-%{compiler_rt_version}%{?rc_ver:rc%{rc_ver}}.src
# see https://sourceware.org/bugzilla/show_bug.cgi?id=25271 # see https://sourceware.org/bugzilla/show_bug.cgi?id=25271
%global optflags %(echo %{optflags} -D_DEFAULT_SOURCE) %global optflags %(echo %{optflags} -D_DEFAULT_SOURCE)
@ -21,7 +20,7 @@
Name: compiler-rt Name: compiler-rt
Version: %{compiler_rt_version}%{?rc_ver:~rc%{rc_ver}} Version: %{compiler_rt_version}%{?rc_ver:~rc%{rc_ver}}
Release: 1%{?dist} Release: 2%{?dist}
Summary: LLVM "compiler-rt" runtime libraries Summary: LLVM "compiler-rt" runtime libraries
License: Apache-2.0 WITH LLVM-exception OR NCSA OR MIT License: Apache-2.0 WITH LLVM-exception OR NCSA OR MIT
@ -29,8 +28,6 @@ URL: http://llvm.org
Source0: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{compiler_rt_version}%{?rc_ver:-rc%{rc_ver}}/%{crt_srcdir}.tar.xz Source0: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{compiler_rt_version}%{?rc_ver:-rc%{rc_ver}}/%{crt_srcdir}.tar.xz
Source1: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{compiler_rt_version}%{?rc_ver:-rc%{rc_ver}}/%{crt_srcdir}.tar.xz.sig Source1: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{compiler_rt_version}%{?rc_ver:-rc%{rc_ver}}/%{crt_srcdir}.tar.xz.sig
Source2: release-keys.asc Source2: release-keys.asc
Source3: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{compiler_rt_version}%{?rc_ver:-rc%{rc_ver}}/%{cmake_srcdir}.tar.xz
Source4: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{compiler_rt_version}%{?rc_ver:-rc%{rc_ver}}/%{cmake_srcdir}.tar.xz.sig
BuildRequires: clang BuildRequires: clang
BuildRequires: cmake BuildRequires: cmake
@ -39,6 +36,7 @@ BuildRequires: python3
# We need python3-devel for %%py3_shebang_fix # We need python3-devel for %%py3_shebang_fix
BuildRequires: python3-devel BuildRequires: python3-devel
BuildRequires: llvm-devel = %{version} BuildRequires: llvm-devel = %{version}
BuildRequires: llvm-cmake-utils = %{version}
BuildRequires: zlib-devel BuildRequires: zlib-devel
# For gpg source verification # For gpg source verification
@ -54,14 +52,11 @@ instrumentation, and Blocks C language extension.
%prep %prep
%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE4}' --data='%{SOURCE3}'
%setup -T -q -b 3 -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 %{crt_srcdir} -p2 %autosetup -n %{crt_srcdir} -p2
# compiler-rt does not allow configuring LLVM_COMMON_CMAKE_UTILS.
ln -s %{_datadir}/llvm/cmake ../cmake
%py3_shebang_fix lib/hwasan/scripts/hwasan_symbolize %py3_shebang_fix lib/hwasan/scripts/hwasan_symbolize
%build %build
@ -130,6 +125,9 @@ popd
%endif %endif
%changelog %changelog
* Thu Jun 15 2023 Nikita Popov <npopov@redhat.com> - 16.0.5-2
- Use llvm-cmake-utils package
* Tue Jun 06 2023 Tulio Magno Quites Machado Filho <tuliom@redhat.com> - 16.0.5-1 * Tue Jun 06 2023 Tulio Magno Quites Machado Filho <tuliom@redhat.com> - 16.0.5-1
- Update to LLVM 16.0.5 - Update to LLVM 16.0.5

2
sources
View File

@ -1,4 +1,2 @@
SHA512 (compiler-rt-16.0.5.src.tar.xz) = a5a841f8f7b257de2fb33271acb3bbe999889152778cdb68227290e68648077fc66e94515aab3388e34be0dfa01995ebd0f1d5b5bc167494408e166549fa3be0 SHA512 (compiler-rt-16.0.5.src.tar.xz) = a5a841f8f7b257de2fb33271acb3bbe999889152778cdb68227290e68648077fc66e94515aab3388e34be0dfa01995ebd0f1d5b5bc167494408e166549fa3be0
SHA512 (compiler-rt-16.0.5.src.tar.xz.sig) = 410c5a26304f11a5505796bf64071bf48559b562b24889054ac5b44a2bfa6cf239fbbc533001e0c62dc901b8b922abd13a25ebad34d70d5b84520c3311f52712 SHA512 (compiler-rt-16.0.5.src.tar.xz.sig) = 410c5a26304f11a5505796bf64071bf48559b562b24889054ac5b44a2bfa6cf239fbbc533001e0c62dc901b8b922abd13a25ebad34d70d5b84520c3311f52712
SHA512 (cmake-16.0.5.src.tar.xz) = 0b81399c872dc886f486568537dab7033de347ba9ea68243db7df6f5651b22c5e3034a5a505185e076de2091b0d8721d35136450d1e1d1ab821bfdd6c5992df2
SHA512 (cmake-16.0.5.src.tar.xz.sig) = 12659c47e1ff4215f0bfe2354bd3a07618f560df0c3098f469c06c04825112cd0bf5610f0e58d7de3ee84d57adbb57a60a5de20b2c8bad9ff70c64e78c3dc3e5