Revert "Disable annobin (new GCC, 12.1)"

This reverts commit 6b5e415919.

Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
This commit is contained in:
David Abdurachmanov 2022-08-15 07:18:05 +03:00
parent 6b5e415919
commit 4b820ddd1d
Signed by: davidlt
GPG Key ID: 8B7F1DA0E2C9FDBB
2 changed files with 3 additions and 6 deletions

2
macros
View File

@ -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

View File

@ -9,7 +9,7 @@
Summary: Red Hat specific rpm configuration files
Name: redhat-rpm-config
Version: %{baserelease}
Release: 1.6.riscv64%{?dist}
Release: 1.5.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,9 +195,6 @@ install -p -m 644 -t %{buildroot}%{_rpmluadir}/fedora/srpm forge.lua
%doc buildflags.md
%changelog
* Sun Aug 14 2022 David Abdurachmanov <davidlt@rivosinc.com> - 226-1.6.riscv64
- Disable annobin (new GCC, 12.1)
* Wed Aug 10 2022 David Abdurachmanov <davidlt@rivosinc.com> - 226-1.5.riscv64
- Re-enable package notes