diff --git a/compiler-rt-12.0.1.src.tar.xz b/compiler-rt-12.0.1.src.tar.xz deleted file mode 100644 index 0e4d10aff466ba59a5114e75f25e431dee951de6..0000000000000000000000000000000000000000 Binary files a/compiler-rt-12.0.1.src.tar.xz and /dev/null differ diff --git a/compiler-rt-12.0.1.src.tar.xz.sig b/compiler-rt-12.0.1.src.tar.xz.sig deleted file mode 100644 index c41c6248cbd653ec1aece40b6e3a8af33cb246bd..0000000000000000000000000000000000000000 Binary files a/compiler-rt-12.0.1.src.tar.xz.sig and /dev/null differ diff --git a/compiler-rt.spec b/compiler-rt.spec index cdd58b728e236cb42f89fb38a0edb51ebc3057ff..5b736ba9ab41e8c525a90c06b5a4004a166361f7 100644 --- a/compiler-rt.spec +++ b/compiler-rt.spec @@ -1,6 +1,7 @@ -#%%global rc_ver 5 +#global rc_ver 3 -%global crt_srcdir compiler-rt-%{version}%{?rc_ver:rc%{rc_ver}}.src +%global compiler_rt_version 13.0.1 +%global crt_srcdir compiler-rt-%{compiler_rt_version}%{?rc_ver:rc%{rc_ver}}.src # see https://sourceware.org/bugzilla/show_bug.cgi?id=25271 %global optflags %(echo %{optflags} -D_DEFAULT_SOURCE) @@ -9,14 +10,14 @@ %global optflags %(echo %{optflags} -Dasm=__asm__) Name: compiler-rt -Version: 12.0.1%{?rc_ver:~rc%{rc_ver}} +Version: %{compiler_rt_version}%{?rc_ver:~rc%{rc_ver}} Release: 1%{?dist} Summary: LLVM "compiler-rt" runtime libraries License: NCSA or MIT URL: http://llvm.org -Source0: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}%{?rc_ver:-rc%{rc_ver}}/%{crt_srcdir}.tar.xz -Source1: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}%{?rc_ver:-rc%{rc_ver}}/%{crt_srcdir}.tar.xz.sig +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 Source2: tstellar-gpg-key.asc Patch0: 0001-PATCH-compiler-rt-Workaround-libstdc-limitation-wrt..patch @@ -70,15 +71,15 @@ cd %{_vpath_builddir} %cmake_install # move blacklist/abilist files to where clang expect them -mkdir -p %{buildroot}%{_libdir}/clang/%{version}/share -mv -v %{buildroot}%{_datadir}/*list.txt %{buildroot}%{_libdir}/clang/%{version}/share/ +mkdir -p %{buildroot}%{_libdir}/clang/%{compiler_rt_version}/share +mv -v %{buildroot}%{_datadir}/*list.txt %{buildroot}%{_libdir}/clang/%{compiler_rt_version}/share/ # move sanitizer libs to better place %global libclang_rt_installdir lib/linux -mkdir -p %{buildroot}%{_libdir}/clang/%{version}/lib -mv -v %{buildroot}%{_prefix}/%{libclang_rt_installdir}/*clang_rt* %{buildroot}%{_libdir}/clang/%{version}/lib -mkdir -p %{buildroot}%{_libdir}/clang/%{version}/lib/linux/ -pushd %{buildroot}%{_libdir}/clang/%{version}/lib +mkdir -p %{buildroot}%{_libdir}/clang/%{compiler_rt_version}/lib +mv -v %{buildroot}%{_prefix}/%{libclang_rt_installdir}/*clang_rt* %{buildroot}%{_libdir}/clang/%{compiler_rt_version}/lib +mkdir -p %{buildroot}%{_libdir}/clang/%{compiler_rt_version}/lib/linux/ +pushd %{buildroot}%{_libdir}/clang/%{compiler_rt_version}/lib for i in *.a *.so do ln -s ../$i linux/$i @@ -88,11 +89,11 @@ done # the symlinks will be dangling if the 32 bits version is not installed, but that should be fine %ifarch x86_64 -mkdir -p %{buildroot}/%{_exec_prefix}/lib/clang/%{version}/lib/linux +mkdir -p %{buildroot}/%{_exec_prefix}/lib/clang/%{compiler_rt_version}/lib/linux for i in *.a *.so do target=`echo "$i" | sed -e 's/x86_64/i386/'` - ln -s ../../../../../lib/clang/%{version}/lib/$target ../../../../%{_lib}/clang/%{version}/lib/linux/ + ln -s ../../../../../lib/clang/%{compiler_rt_version}/lib/$target ../../../../%{_lib}/clang/%{compiler_rt_version}/lib/linux/ done %endif @@ -106,13 +107,19 @@ popd %files %license LICENSE.TXT %{_includedir}/* -%{_libdir}/clang/%{version}/lib/* -%{_libdir}/clang/%{version}/share/* +%{_libdir}/clang/%{compiler_rt_version}/lib/* +%{_libdir}/clang/%{compiler_rt_version}/share/* %ifarch x86_64 aarch64 %{_bindir}/hwasan_symbolize %endif %changelog +* Thu Feb 03 2022 Tom Stellard - 13.0.1-1 +- 13.0.1 Release + +* Fri Oct 15 2021 Tom Stellard - 13.0.0-1 +- 13.0.0 Release + * Fri Jul 16 2021 sguelton@redhat.com - 12.0.1-1 - 12.0.1 release diff --git a/download b/download new file mode 100644 index 0000000000000000000000000000000000000000..04b993994690140d6238345b2dc471b002d41683 --- /dev/null +++ b/download @@ -0,0 +1,2 @@ +f534ab8fb371ec1a8a22a6fa5809be46 compiler-rt-13.0.1.src.tar.xz +7f5c40821089df09df0ec9580e4d0540 compiler-rt-13.0.1.src.tar.xz.sig