From a621b396194529348d28b5e5295429c4c4c8dea6 Mon Sep 17 00:00:00 2001 From: David Abdurachmanov Date: Mon, 13 Feb 2023 17:12:25 +0200 Subject: [PATCH] Disable annobin (new GCC, 13) Signed-off-by: David Abdurachmanov --- macros | 2 +- redhat-rpm-config.spec | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/macros b/macros index d778275..38cc158 100644 --- a/macros +++ b/macros @@ -323,7 +323,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 70a0327..3effeab 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.1.riscv64%{?dist} +Release: 1.2.riscv64%{?dist} # No version specified. License: GPL+ URL: https://src.fedoraproject.org/rpms/redhat-rpm-config @@ -118,8 +118,8 @@ Requires: ansible-srpm-macros Requires: rpm >= 4.11.0 Requires: dwz >= 0.4 Requires: zip -Requires: (annobin-plugin-gcc if gcc) -Requires: (gcc-plugin-annobin if gcc) +#Requires: (annobin-plugin-gcc if gcc) +#Requires: (gcc-plugin-annobin if gcc) # for brp-mangle-shebangs Requires: %{_bindir}/find @@ -253,6 +253,9 @@ install -p -m 644 -t %{buildroot}%{_rpmluadir}/fedora/srpm forge.lua %doc buildflags.md %changelog +* Mon Feb 13 2023 David Abdurachmanov - 249-1.2.riscv64 +- Disable annobin (new GCC) + * Mon Feb 13 2023 David Abdurachmanov - 249-1.1.riscv64 - Add riscv64 to gap supported arch list