rpms/redhat-rpm-config
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Reenable annobin after GCC 10 integration (#1792892)

Browse Source 
This reverts commit c18924507d
("Temporarily disable annobin for GCC 10 (#1792892)").
This commit is contained in:
Florian Weimer 2020-01-20 13:50:15 +01:00
parent c18924507d
commit fff3459086
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
macros
View File

@ -216,7 +216,7 @@ print(result)
# Add extra information to binary objects created by gcc for Fedora 28: # Add extra information to binary objects created by gcc for Fedora 28:
# https://pagure.io/fesco/issue/1780 (accepted on 2017-10-30) # https://pagure.io/fesco/issue/1780 (accepted on 2017-10-30)
# Use "%undefine _annotated_build" to disable. # Use "%undefine _annotated_build" to disable.
#%_annotated_build 1 %_annotated_build 1
%_annotated_cflags %{?_annotated_build:%{_annobin_cflags}} %_annotated_cflags %{?_annotated_build:%{_annobin_cflags}}
# Fail linking if there are undefined symbols. Required for proper # Fail linking if there are undefined symbols. Required for proper

6
redhat-rpm-config.spec
View File

@ -6,7 +6,7 @@
Summary: Red Hat specific rpm configuration files Summary: Red Hat specific rpm configuration files
Name: redhat-rpm-config Name: redhat-rpm-config
Version: 147 Version: 148
Release: 1%{?dist} Release: 1%{?dist}
# No version specified. # No version specified.
License: GPL+ License: GPL+
@ -107,6 +107,7 @@ Requires: qt5-srpm-macros
Requires: rpm >= 4.11.0 Requires: rpm >= 4.11.0
Requires: dwz >= 0.4 Requires: dwz >= 0.4
Requires: zip Requires: zip
Requires: (annobin if gcc)
# for brp-mangle-shebangs # for brp-mangle-shebangs
Requires: %{_bindir}/find Requires: %{_bindir}/find
@ -206,6 +207,9 @@ install -p -m 644 -t %{buildroot}%{_rpmluadir}/fedora/srpm forge.lua
%{_rpmconfigdir}/macros.d/macros.kmp %{_rpmconfigdir}/macros.d/macros.kmp
%changelog %changelog
* Mon Jan 20 2020 Florian Weimer <fweimer@redhat.com> - 148-1
- Reenable annobin after GCC 10 integration (#1792892)
* Mon Jan 20 2020 Florian Weimer <fweimer@redhat.com> - 147-1 * Mon Jan 20 2020 Florian Weimer <fweimer@redhat.com> - 147-1
- Temporarily disable annobin for GCC 10 (#1792892) - Temporarily disable annobin for GCC 10 (#1792892)