From 6b5e41591989c415254b98c9da1f49b329bde7d9 Mon Sep 17 00:00:00 2001 From: David Abdurachmanov Date: Sun, 14 Aug 2022 21:30:51 +0300 Subject: [PATCH] Disable annobin (new GCC, 12.1) 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 d10fa49..31069cc 100644 --- a/macros +++ b/macros @@ -313,7 +313,7 @@ print(result) # ...except on armv7hl, which has an issue whose root-cause isn't # clear yet: https://bugzilla.redhat.com/show_bug.cgi?id=1951492 # 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 c26291b..208d083 100644 --- a/redhat-rpm-config.spec +++ b/redhat-rpm-config.spec @@ -9,7 +9,7 @@ Summary: Red Hat specific rpm configuration files Name: redhat-rpm-config Version: %{baserelease} -Release: 1.5.riscv64%{?dist} +Release: 1.6.riscv64%{?dist} # No version specified. License: GPL+ URL: https://src.fedoraproject.org/rpms/redhat-rpm-config @@ -112,7 +112,7 @@ Requires: ansible-srpm-macros Requires: rpm >= 4.11.0 Requires: dwz >= 0.4 Requires: zip -Requires: (annobin-plugin-gcc if gcc) +#Requires: (annobin-plugin-gcc if gcc) # for brp-mangle-shebangs Requires: %{_bindir}/find @@ -195,6 +195,9 @@ install -p -m 644 -t %{buildroot}%{_rpmluadir}/fedora/srpm forge.lua %doc buildflags.md %changelog +* Sun Aug 14 2022 David Abdurachmanov - 226-1.6.riscv64 +- Disable annobin (new GCC, 12.1) + * Wed Aug 10 2022 David Abdurachmanov - 226-1.5.riscv64 - Re-enable package notes