rpms/annobin
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add an early require of gcc.

Browse Source
This commit is contained in:
Nick Clifton 2018-02-23 10:40:42 +00:00
parent 0078c77a9c
commit fb74d1ed1c
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
annobin.spec
View File

@ -36,10 +36,11 @@ URL: https://fedoraproject.org/wiki/Toolchain/Watermark
# So we instead query the version from gcc's output. # So we instead query the version from gcc's output.
# #
# gcc.spec has: # gcc.spec has:
# Version: %{gcc_version} # Version: %%{gcc_version}
# Release: %{gcc_release}%{?dist} # Release: %%{gcc_release}%%{?dist}
# ...snip... # ...snip...
# echo 'Red Hat %{version}-%{gcc_release}' > gcc/DEV-PHASE # echo 'Red Hat %%{version}-%%{gcc_release}' > gcc/DEV-PHASE
#
# So, given this output: # So, given this output:
# #
# $ gcc --version # $ gcc --version
@ -60,6 +61,7 @@ URL: https://fedoraproject.org/wiki/Toolchain/Watermark
# sufficient escaping for the command line to survive intact as it is passed # sufficient escaping for the command line to survive intact as it is passed
# down through the sub-shell. # down through the sub-shell.
Requires: gcc
%global gcc_vr %(gcc --version | gawk 'match (\$0, ".*Red Hat \([^\\)-]*\)", a) { print a[1]; }') %global gcc_vr %(gcc --version | gawk 'match (\$0, ".*Red Hat \([^\\)-]*\)", a) { print a[1]; }')
# Define a boolean to make it easy to turn the above off, in case it fails: # Define a boolean to make it easy to turn the above off, in case it fails:
@ -75,8 +77,6 @@ Source: https://nickc.fedorapeople.org/annobin-%{version}.tar.xz
%if %{with_hard_gcc_version_requirement} %if %{with_hard_gcc_version_requirement}
Requires: gcc == %{gcc_vr} Requires: gcc == %{gcc_vr}
BuildRequires: gcc == %{gcc_vr} BuildRequires: gcc == %{gcc_vr}
%else
Requires: gcc
%endif %endif
Requires(post): /sbin/install-info Requires(post): /sbin/install-info