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

Ship blacklist files in the proper directory

Browse Source
This commit is contained in:
sergesanspaille 2020-02-12 19:28:20 +00:00
parent b1b7fc453a
commit 6744b0fb20
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
compiler-rt.spec
View File

@ -4,7 +4,7 @@
%endif %endif
%global rc_ver 1 %global rc_ver 1
%global baserelease 0.1 %global baserelease 0.2
%global crt_srcdir compiler-rt-%{version}%{?rc_ver:rc%{rc_ver}}.src %global crt_srcdir compiler-rt-%{version}%{?rc_ver:rc%{rc_ver}}.src
@ -67,18 +67,13 @@ make %{?_smp_mflags}
cd _build cd _build
make install DESTDIR=%{buildroot} make install DESTDIR=%{buildroot}
mkdir -p %{buildroot}%{_libdir}/clang/%{version}/lib # move blacklist/abilist files to where clang expect them
mkdir -p %{buildroot}%{_libdir}/clang/%{version}/share
%ifarch aarch64 mv -v %{buildroot}%{_datadir}/*list.txt %{buildroot}%{_libdir}/clang/%{version}/share/
%global aarch64_blacklists hwasan_blacklist.txt
%endif
for file in %{aarch64_blacklists} asan_blacklist.txt msan_blacklist.txt dfsan_blacklist.txt cfi_blacklist.txt dfsan_abilist.txt hwasan_blacklist.txt; do
mv -v %{buildroot}%{_datadir}/${file} %{buildroot}%{_libdir}/clang/%{version}/ || :
done
# move sanitizer libs to better place # move sanitizer libs to better place
%global libclang_rt_installdir lib/linux %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 mv -v %{buildroot}%{_prefix}/%{libclang_rt_installdir}/*clang_rt* %{buildroot}%{_libdir}/clang/%{version}/lib
mkdir -p %{buildroot}%{_libdir}/clang/%{version}/lib/linux/ mkdir -p %{buildroot}%{_libdir}/clang/%{version}/lib/linux/
pushd %{buildroot}%{_libdir}/clang/%{version}/lib pushd %{buildroot}%{_libdir}/clang/%{version}/lib
@ -128,6 +123,9 @@ fi
%changelog %changelog
* Wed Feb 12 2020 sguelton@redhat.com - 10.0.0-0.2.rc1
- Ship blacklist files in the proper directory, see rhbz#1794936
* Fri Jan 31 2020 sguelton@redhat.com - 10.0.0-0.1.rc1 * Fri Jan 31 2020 sguelton@redhat.com - 10.0.0-0.1.rc1
- 10.0.0 rc1 - 10.0.0 rc1