From: Slava Barinov <v.barinov@samsung.com>
Date: Wed, 14 Nov 2018 08:58:30 +0000 (+0300)
Subject: [Sanitizers] Add %_auxbuildinfo to mark sanitized packages
X-Git-Tag: accepted/tizen/base/20190111.055038~2^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F77%2F193077%2F7;p=platform%2Fupstream%2Fgcc-contrib.git

[Sanitizers] Add %_auxbuildinfo to mark sanitized packages

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

diff --git a/packaging/gcc-contrib.spec b/packaging/gcc-contrib.spec
index 59ff272..c6177d8 100644
--- a/packaging/gcc-contrib.spec
+++ b/packaging/gcc-contrib.spec
@@ -104,7 +104,7 @@ chmod a+w %{libsubdir}
 cat >> /usr/lib/rpm/tizen_macros << EOF
 
 %%asan_force_options %{asan_force_options}
-%%gcc_unforce_options /usr/bin/gcc-unforce-options
+%%gcc_unforce_options %%{lua: rpm.define("asan_unforced 1"); print("/usr/bin/gcc-unforce-options")}
 %%gcc_force_options /usr/bin/gcc-force-options
 %%gcc_force_default_options %%gcc_force_options %%asan_force_options -fno-common
 %%restore_fcommon \\
@@ -129,6 +129,9 @@ chmod a-w %{libsubdir}
 # Restore limit configurations set for ASan
 sed '/abuild/d' -i /etc/security/limits.conf
 
+# Remove additional macros from config
+sed -e '\|^\# /etc/rpm/macros.asan$|,\|^\# /etc/rpm/macros.asan ends here|d' -i /usr/lib/rpm/tizen_macros
+
 %package -n ubsan-force-options
 Summary:    Scripts to enable automatic package sanitization
 Group:      System Environment
@@ -149,7 +152,7 @@ chmod a+w %{libsubdir}
 cat >> /usr/lib/rpm/tizen_macros << EOF
 
 %%ubsan_force_options %{ubsan_force_options}
-%%gcc_unforce_options /usr/bin/gcc-unforce-options
+%%gcc_unforce_options %%{lua: rpm.define("ubsan_unforced 1"); print("/usr/bin/gcc-unforce-options")}
 %%gcc_force_options /usr/bin/gcc-force-options
 %%gcc_force_default_options %%gcc_force_options %%ubsan_force_options
 EOF
@@ -161,6 +164,8 @@ chmod a-w %{libsubdir}
 [ -d /emul/ ] && chmod a-w /emul/usr/bin/ && chmod a-w /emul/home/abuild/rpmbuild/BUILD/gcc-*/obj/gcc/ \
               && find -L /emul/usr/*/gcc -name 'collect2' | xargs dirname | xargs chmod a-w
 /usr/bin/gcc-unforce-options
+# Remove additional macros from config
+sed -e '\|^\# /etc/rpm/macros.ubsan$|,\|^\# /etc/rpm/macros.ubsan ends here|d' -i /usr/lib/rpm/tizen_macros
 
 %package -n isan-force-options
 Summary:    Scripts to enable automatic package sanitization
diff --git a/packaging/macros.asan b/packaging/macros.asan
index 27775cf..1e669cf 100644
--- a/packaging/macros.asan
+++ b/packaging/macros.asan
@@ -15,3 +15,8 @@
     end           \
    }              \
    %{nil}
+
+%_auxbuildinfo %{?!asan_unforced:asan\
+asan-force-options-%(rpm -q asan-force-options --queryformat \"%{VCS}\" | sed -e 's/.*\#//')}%{nil}
+
+# /etc/rpm/macros.asan ends here
diff --git a/packaging/macros.ubsan b/packaging/macros.ubsan
index 652a49b..960224c 100644
--- a/packaging/macros.ubsan
+++ b/packaging/macros.ubsan
@@ -37,3 +37,8 @@ This package provides UBSan log files for package %{name}.\
 %defattr(-,root,root)\
 /usr/share/ubsan/*ubsan.log*\
 %{nil}
+
+%_auxbuildinfo %{?!ubsan_unforced:ubsan\
+ubsan-force-options-%(rpm -q ubsan-force-options --queryformat \"%{VCS}\" | sed -e 's/.*\#//')}%{nil}
+
+# /etc/rpm/macros.ubsan ends here