Move sanitizer libraries to corresponding packages

Currently libasan.so, libtsan.so and liblsan.so symlinks are packaged
into gcc.rpm but asan-build-env script pushes 'libasan.so' name without
suffix into /etc/ld.so.preload which breaks sanitized builds.

Now they are moved into corresponding packages and will be created
during sanitizer rpm installation.

Change-Id: I0917185adb0084048ef54c1cf9b40874006b71e0
Signed-off-by: Slava Barinov <v.barinov@samsung.com>

diff --git a/packaging/gcc-aarch64.spec b/packaging/gcc-aarch64.spec
index 5c46e42..971af2c 100644 (file)
--- a/packaging/gcc-aarch64.spec
+++ b/packaging/gcc-aarch64.spec
@@ -882,6 +882,15 @@ chmod a+x %{buildroot}%{_prefix}/bin/gcc-unforce-options
 %{libsubdir}/include/cilk/*
 %endif
 %{libsubdir}/include/sanitizer/*
+%ifarch %asan_arch
+%exclude %{libdir}/libasan.so
+%endif
+%ifarch %lsan_arch
+%exclude %{libdir}/liblsan.so
+%endif
+%ifarch %tsan_arch
+%exclude %{libdir}/libtsan.so
+%endif
 
 %files c++
 %defattr(-,root,root)
@@ -914,19 +923,19 @@ chmod a+x %{buildroot}%{_prefix}/bin/gcc-unforce-options
 %ifarch %asan_arch
 %files -n libasan
 %defattr(-,root,root)
-%{libdir}/libasan.so.*
+%{libdir}/libasan.so*
 %endif
 
 %ifarch %lsan_arch
 %files -n liblsan
 %defattr(-,root,root)
-%{libdir}/liblsan.so.*
+%{libdir}/liblsan.so*
 %endif
 
 %ifarch %tsan_arch
 %files -n libtsan
 %defattr(-,root,root)
-%{libdir}/libtsan.so.*
+%{libdir}/libtsan.so*
 %endif
 
 %ifarch %atomic_arch

diff --git a/packaging/gcc-armv7l.spec b/packaging/gcc-armv7l.spec
index ef33265..143eaa8 100644 (file)
--- a/packaging/gcc-armv7l.spec
+++ b/packaging/gcc-armv7l.spec
@@ -882,6 +882,15 @@ chmod a+x %{buildroot}%{_prefix}/bin/gcc-unforce-options
 %{libsubdir}/include/cilk/*
 %endif
 %{libsubdir}/include/sanitizer/*
+%ifarch %asan_arch
+%exclude %{libdir}/libasan.so
+%endif
+%ifarch %lsan_arch
+%exclude %{libdir}/liblsan.so
+%endif
+%ifarch %tsan_arch
+%exclude %{libdir}/libtsan.so
+%endif
 
 %files c++
 %defattr(-,root,root)
@@ -914,19 +923,19 @@ chmod a+x %{buildroot}%{_prefix}/bin/gcc-unforce-options
 %ifarch %asan_arch
 %files -n libasan
 %defattr(-,root,root)
-%{libdir}/libasan.so.*
+%{libdir}/libasan.so*
 %endif
 
 %ifarch %lsan_arch
 %files -n liblsan
 %defattr(-,root,root)
-%{libdir}/liblsan.so.*
+%{libdir}/liblsan.so*
 %endif
 
 %ifarch %tsan_arch
 %files -n libtsan
 %defattr(-,root,root)
-%{libdir}/libtsan.so.*
+%{libdir}/libtsan.so*
 %endif
 
 %ifarch %atomic_arch

diff --git a/packaging/linaro-gcc.spec b/packaging/linaro-gcc.spec
index 79284e9..7dc620a 100644 (file)
--- a/packaging/linaro-gcc.spec
+++ b/packaging/linaro-gcc.spec
@@ -879,6 +879,15 @@ chmod a+x %{buildroot}%{_prefix}/bin/gcc-unforce-options
 %{libsubdir}/include/cilk/*
 %endif
 %{libsubdir}/include/sanitizer/*
+%ifarch %asan_arch
+%exclude %{libdir}/libasan.so
+%endif
+%ifarch %lsan_arch
+%exclude %{libdir}/liblsan.so
+%endif
+%ifarch %tsan_arch
+%exclude %{libdir}/libtsan.so
+%endif
 
 %files c++
 %defattr(-,root,root)
@@ -911,19 +920,19 @@ chmod a+x %{buildroot}%{_prefix}/bin/gcc-unforce-options
 %ifarch %asan_arch
 %files -n libasan
 %defattr(-,root,root)
-%{libdir}/libasan.so.*
+%{libdir}/libasan.so*
 %endif
 
 %ifarch %lsan_arch
 %files -n liblsan
 %defattr(-,root,root)
-%{libdir}/liblsan.so.*
+%{libdir}/liblsan.so*
 %endif
 
 %ifarch %tsan_arch
 %files -n libtsan
 %defattr(-,root,root)
-%{libdir}/libtsan.so.*
+%{libdir}/libtsan.so*
 %endif
 
 %ifarch %atomic_arch