From 2e6986d6e776b9ca6148c87ccf87cbebf6c4e8f2 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Wed, 21 Dec 2022 16:32:48 +0000 Subject: [PATCH] Annocheck: Improve handling of tool versions --- annobin.spec | 17 +++++++++++++++-- sources | 2 +- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/annobin.spec b/annobin.spec index 8e69e02..060c4f7 100644 --- a/annobin.spec +++ b/annobin.spec @@ -1,11 +1,12 @@ Name: annobin Summary: Annotate and examine compiled binary files -Version: 10.97 +Version: 10.99 Release: 1%{?dist} License: GPLv3+ URL: https://sourceware.org/annobin/ # Maintainer: nickc@redhat.com +# Web Page: https://sourceware.org/annobin/ # Watermark Protocol: https://fedoraproject.org/wiki/Toolchain/Watermark #--------------------------------------------------------------------------------- @@ -37,7 +38,7 @@ URL: https://sourceware.org/annobin/ # checking logic or when building on RHEL-7 or earlier. %global with_hard_gcc_version_requirement 1 -%bcond_with plugin_rebuild +%bcond_without plugin_rebuild # Allow the building of annobin without using annobin itself. # This is because if we are bootstrapping a new build environment we can have # a new version of gcc installed, but without a new of annobin installed. @@ -396,7 +397,14 @@ make -C gcc-plugin clean BUILD_FLAGS="-fplugin=%{_tmppath}/tmp_annobin.so" # Disable the standard annobin plugin so that we do get conflicts. +# Note - Fedora's rpm uses a different way of evaluating macros. +%if 0%{?fedora} == 0 +echo "OLD EVAL" OPTS="$(rpm --eval '%undefine _annotated_build %build_cflags %build_ldflags')" +%else +echo "NEW EVAL" +OPTS="$(rpm --undefine=_annotated_build --eval '%build_cflags %build_ldflags')" +%endif # If building on systems with an assembler that does not support the # .attach_to_group pseudo op (eg RHEL-7) then enable the next line. @@ -508,6 +516,11 @@ fi #--------------------------------------------------------------------------------- %changelog +* Wed Dec 21 2022 Nick Clifton - 10.99-1 +- Annocheck: Improve handling of tool versions. +- Spec File: Fix building with plugin_rebuild enabled. +- GCC plugin: Fix building with gcc-13. + * Fri Dec 16 2022 Nick Clifton - 10.97-1 - Annocheck: Add test for binaries built by cross compilers. - Annocheck: Improve heuristic used to detect binaries without code. (#2144533) diff --git a/sources b/sources index 2982247..48309aa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (annobin-10.97.tar.xz) = 3d9f302fbf69c388c760e67c953464b36410d3ad10cd489e5eb15ec5c9d1272775a9a8ac6ded4a89807b5d651e765ae2782143113de878eb525c562250039a4e +SHA512 (annobin-10.99.tar.xz) = 601bd90aa4b6528f595efebf5b864aae5176e8e9d80c7f9cf77a1252b85a15c8440866a1f4881176f6bb50418c037e8924f32456533e90de473dae8abe92d53e