From c18924507d2930ca40b34f9011844d810166200b Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Mon, 20 Jan 2020 11:42:04 +0100 Subject: [PATCH] Temporarily disable annobin for GCC 10 (#1792892) --- macros | 2 +- redhat-rpm-config.spec | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/macros b/macros index cd06548..59bb5b6 100644 --- a/macros +++ b/macros @@ -216,7 +216,7 @@ print(result) # Add extra information to binary objects created by gcc for Fedora 28: # https://pagure.io/fesco/issue/1780 (accepted on 2017-10-30) # Use "%undefine _annotated_build" to disable. -%_annotated_build 1 +#%_annotated_build 1 %_annotated_cflags %{?_annotated_build:%{_annobin_cflags}} # Fail linking if there are undefined symbols. Required for proper diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec index c052047..05e80f2 100644 --- a/redhat-rpm-config.spec +++ b/redhat-rpm-config.spec @@ -6,7 +6,7 @@ Summary: Red Hat specific rpm configuration files Name: redhat-rpm-config -Version: 146 +Version: 147 Release: 1%{?dist} # No version specified. License: GPL+ @@ -107,7 +107,6 @@ Requires: qt5-srpm-macros Requires: rpm >= 4.11.0 Requires: dwz >= 0.4 Requires: zip -Requires: (annobin if gcc) # for brp-mangle-shebangs Requires: %{_bindir}/find @@ -207,6 +206,9 @@ install -p -m 644 -t %{buildroot}%{_rpmluadir}/fedora/srpm forge.lua %{_rpmconfigdir}/macros.d/macros.kmp %changelog +* Mon Jan 20 2020 Florian Weimer - 147-1 +- Temporarily disable annobin for GCC 10 (#1792892) + * Thu Dec 05 2019 Denys Vlasenko - 146-1 - kmod.prov: fix and speed it up