Compare commits
10 Commits
fcbaca2c0b
...
5ace1e7bd0
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5ace1e7bd0 | ||
|
|
9b29a5cbb1 | ||
|
|
438125b0a4 | ||
|
|
d7ad05077a | ||
|
|
acaef56cfe | ||
|
|
e5f4934efd | ||
|
|
a127c4cc14 | ||
|
|
b6f3604c10 | ||
|
|
3bd6a6c218 | ||
|
|
d50fe1ab2c |
@ -3,18 +3,13 @@ Summary: Build with gcov
|
||||
License: GPL
|
||||
Group: System/Management
|
||||
Version: 1.0
|
||||
Release: 0.6
|
||||
Release: 0.11
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}
|
||||
#Source: %{name}-%{version}.tar.bz2
|
||||
|
||||
BuildRequires: util-linux coreutils
|
||||
BuildRequires: -custom_build_tool-nocheck
|
||||
BuildRequires: -obs-env
|
||||
BuildRequires: -gcc_secure
|
||||
BuildRequires: -custom_build_tool-sign
|
||||
BuildRequires: -bep-env
|
||||
|
||||
Requires: util-linux rpm grep binutils gcc coreutils rpm-build
|
||||
Requires: util-linux rpm grep binutils gcc coreutils rpm-build gcc-c++
|
||||
#expect grep sudo kernel-default kernel-default-base openssh
|
||||
%description
|
||||
Build with gcov
|
||||
@ -77,7 +72,7 @@ else
|
||||
$old_gcc"_old" "\$@"
|
||||
fi
|
||||
END1
|
||||
chmod 777 $old_gcc $old_gcc"_old"
|
||||
chmod 755 $old_gcc $old_gcc"_old"
|
||||
|
||||
old_gplus=/usr/bin/g++
|
||||
if [ -f $old_gplus ]; then
|
||||
@ -86,7 +81,7 @@ cat <<END1 > $old_gplus
|
||||
#!/bin/sh
|
||||
gcc_secure_exclude=\`rpm --eval %{gcc_secure_exclude}\`
|
||||
if ! cat /.build.command | egrep "\$gcc_secure_exclude" &>/dev/null; then
|
||||
sec_opt='-fPIC -D_FORTIFY_SOURCE=2 -O2 -Wl,-z,relro -Wl,-z,now -Wl,-z,noexecstack -Wtrampolines'
|
||||
sec_opt='-fPIC -D_FORTIFY_SOURCE=2 -O2 -Wl,-z,relro -Wl,-z,now -Wl,-z,noexecstack -Wtrampolines -fsigned-char'
|
||||
fs_opt=''
|
||||
|
||||
if [[ "\$@" =~ "-O0" ]]; then
|
||||
@ -116,7 +111,7 @@ else
|
||||
$old_gplus"_old" "\$@"
|
||||
fi
|
||||
END1
|
||||
chmod 777 $old_gplus $old_gplus"_old"
|
||||
chmod 755 $old_gplus $old_gplus"_old"
|
||||
fi
|
||||
|
||||
old_cpp=/usr/bin/c++
|
||||
@ -126,7 +121,7 @@ cat <<END1 > $old_cpp
|
||||
#!/bin/sh
|
||||
gcc_secure_exclude=\`rpm --eval %{gcc_secure_exclude}\`
|
||||
if ! cat /.build.command | egrep "\$gcc_secure_exclude" &>/dev/null; then
|
||||
sec_opt='-fPIC -D_FORTIFY_SOURCE=2 -O2 -Wl,-z,relro -Wl,-z,now -Wl,-z,noexecstack -Wtrampolines'
|
||||
sec_opt='-fPIC -D_FORTIFY_SOURCE=2 -O2 -Wl,-z,relro -Wl,-z,now -Wl,-z,noexecstack -Wtrampolines -fsigned-char'
|
||||
fs_opt=''
|
||||
|
||||
if [[ "\$@" =~ "-O0" ]]; then
|
||||
@ -152,7 +147,7 @@ else
|
||||
$old_cpp"_old" "\$@"
|
||||
fi
|
||||
END1
|
||||
chmod 777 $old_cpp $old_cpp"_old"
|
||||
chmod 755 $old_cpp $old_cpp"_old"
|
||||
fi
|
||||
|
||||
%preun
|
||||
@ -172,6 +167,36 @@ rm -rf %{_tmppath}/%{name}-%{version}
|
||||
rm -rf $RPM_BUILD_DIR/%{name}-%{version}
|
||||
|
||||
%changelog
|
||||
* Fri Nov 25 2022 Ge Wang<wnagge20@h-partners.com> - 1.0-0.11
|
||||
- Type:enhancement
|
||||
- ID:NA
|
||||
- SUG:NA
|
||||
- DESC: add requires gcc-c++
|
||||
|
||||
* Tue Oct 10 2023 xiasenlin<xiasenlin1@huawei.com> - 1.0-0.10
|
||||
- Type:modify
|
||||
- ID:NA
|
||||
- SUG:NA
|
||||
- DESC: delete useless BuildRequires
|
||||
|
||||
* Wed Jul 21 2021 licihua<licihua@huawei.com> - 1.0-0.9
|
||||
- Type:enhancement
|
||||
- ID:NA
|
||||
- SUG:NA
|
||||
- DESC: support -fsigned-char for g++
|
||||
|
||||
* Mon Jul 12 2021 shenyangyang<shenyangyang4@huawei.com> - 1.0-0.8
|
||||
- Type:enhancement
|
||||
- ID:NA
|
||||
- SUG:NA
|
||||
- DESC:change file mode from 777 to 755 for secure
|
||||
|
||||
* Thu Apr 8 2021 shenyangyang<shenyangyang4@huawei.com> - 1.0-0.7
|
||||
- Type:enhancement
|
||||
- ID:NA
|
||||
- SUG:NA
|
||||
- DESC: bump release rebuilding for adding rhash.spec to macro gcc_secure_exclude
|
||||
|
||||
* Tue Feb 18 2020 yanzhihua<yanzhihua4@huawei.com> - 1.0-0.6
|
||||
- Type:enhancement
|
||||
- ID:NA
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user