From 441dd59e70cde8d60bc0d192e6dd05d4d0189f08 Mon Sep 17 00:00:00 2001 From: David Abdurachmanov Date: Wed, 3 Aug 2022 09:04:46 +0300 Subject: [PATCH] Disable annobin for a new GCC Signed-off-by: David Abdurachmanov --- macros | 2 +- redhat-rpm-config.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/macros b/macros index cf4819d..3ca5150 100644 --- a/macros +++ b/macros @@ -308,7 +308,7 @@ print(result) # Add extra information to binary objects created by the compiler: # https://pagure.io/fesco/issue/1780 (accepted on 2017-10-30) # Use "%undefine _annotated_build" to disable. -%_annotated_build 1 +#%_annotated_build 1 %_annobin_gcc_plugin -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 # The annobin plugin is not built for clang yet %_annobin_clang_plugin %dnl-fplugin=/usr/lib64/clang/`clang -dumpversion`/lib/annobin.so diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec index 9817f2e..4ca5eeb 100644 --- a/redhat-rpm-config.spec +++ b/redhat-rpm-config.spec @@ -7,7 +7,7 @@ Summary: Red Hat specific rpm configuration files Name: redhat-rpm-config Version: 176 -Release: 3%{?dist} +Release: 3.0.riscv64%{?dist} # No version specified. License: GPL+ URL: https://src.fedoraproject.org/rpms/redhat-rpm-config @@ -117,7 +117,7 @@ Requires: rpmautospec-rpm-macros Requires: rpm >= 4.11.0 Requires: dwz >= 0.4 Requires: zip -Requires: (annobin if (gcc or clang)) +#Requires: (annobin if (gcc or clang)) # for brp-mangle-shebangs Requires: %{_bindir}/find @@ -216,6 +216,9 @@ install -p -m 644 -t %{buildroot}%{_rpmluadir}/fedora/srpm forge.lua %{_rpmconfigdir}/macros.d/macros.kmp %changelog +* Wed Aug 03 2022 David Abdurachmanov - 176-3.0.riscv64 +- Disable annobin (new GCC) + * Sun Aug 15 2021 Michel Alexandre Salim - 176-3 - Fix macros.build-constraints' %%limit_build - number of CPUs will never be set to less than 1