From 5e07ac46858b362df289031a23536c0a89e3bcca Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Tue, 20 Dec 2022 10:05:35 +0100 Subject: [PATCH 1/6] Hacks for GCC 13 test build. --- annobin.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/annobin.spec b/annobin.spec index 9763de8..870cc90 100644 --- a/annobin.spec +++ b/annobin.spec @@ -2,7 +2,7 @@ Name: annobin Summary: Annotate and examine compiled binary files Version: 10.98 -Release: 1%{?dist} +Release: 1.0.1%{?dist} License: GPLv3+ URL: https://sourceware.org/annobin/ # Maintainer: nickc@redhat.com @@ -36,9 +36,9 @@ URL: https://sourceware.org/annobin/ # Set this to zero to disable the requirement for a specific version of gcc. # This should only be needed if there is some kind of problem with the version # checking logic or when building on RHEL-7 or earlier. -%global with_hard_gcc_version_requirement 1 +%global with_hard_gcc_version_requirement 0 -%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. From f1baeaa3a376a189be756e5c749e62e510d92030 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Tue, 20 Dec 2022 10:54:53 +0100 Subject: [PATCH 2/6] Fix build with annotations disabled. --- annobin.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/annobin.spec b/annobin.spec index 870cc90..1429279 100644 --- a/annobin.spec +++ b/annobin.spec @@ -397,7 +397,7 @@ make -C gcc-plugin clean BUILD_FLAGS="-fplugin=%{_tmppath}/tmp_annobin.so" # Disable the standard annobin plugin so that we do get conflicts. -OPTS="$(rpm --eval '%undefine _annotated_build %build_cflags %build_ldflags')" +OPTS="$(rpm --undefine=_annotated_build --eval '%build_cflags %build_ldflags')" # 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. From af5fa6fe58d09443ad3f490e66a312bdbdb75228 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Tue, 20 Dec 2022 10:32:48 +0100 Subject: [PATCH 3/6] Rebuild with version lock on GCC 13. --- annobin.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/annobin.spec b/annobin.spec index 1429279..720d9ae 100644 --- a/annobin.spec +++ b/annobin.spec @@ -2,7 +2,7 @@ Name: annobin Summary: Annotate and examine compiled binary files Version: 10.98 -Release: 1.0.1%{?dist} +Release: 1.0.2%{?dist} License: GPLv3+ URL: https://sourceware.org/annobin/ # Maintainer: nickc@redhat.com @@ -36,7 +36,7 @@ URL: https://sourceware.org/annobin/ # Set this to zero to disable the requirement for a specific version of gcc. # This should only be needed if there is some kind of problem with the version # checking logic or when building on RHEL-7 or earlier. -%global with_hard_gcc_version_requirement 0 +%global with_hard_gcc_version_requirement 1 %bcond_without plugin_rebuild # Allow the building of annobin without using annobin itself. From 505da0505d2a93003236800a932ecb0adc5842c2 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Wed, 21 Dec 2022 09:47:14 +0100 Subject: [PATCH 4/6] Tweaks for GCC 13 test build. --- annobin.spec | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/annobin.spec b/annobin.spec index 720d9ae..8591bbe 100644 --- a/annobin.spec +++ b/annobin.spec @@ -2,7 +2,7 @@ Name: annobin Summary: Annotate and examine compiled binary files Version: 10.98 -Release: 1.0.2%{?dist} +Release: 3.0.1%{?dist} License: GPLv3+ URL: https://sourceware.org/annobin/ # Maintainer: nickc@redhat.com @@ -36,9 +36,9 @@ URL: https://sourceware.org/annobin/ # Set this to zero to disable the requirement for a specific version of gcc. # This should only be needed if there is some kind of problem with the version # checking logic or when building on RHEL-7 or earlier. -%global with_hard_gcc_version_requirement 1 +%global with_hard_gcc_version_requirement 0 -%bcond_without plugin_rebuild +%bcond_with 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,8 +396,12 @@ cp gcc-plugin/.libs/annobin.so.0.0.0 %{_tmppath}/tmp_annobin.so make -C gcc-plugin clean BUILD_FLAGS="-fplugin=%{_tmppath}/tmp_annobin.so" -# Disable the standard annobin plugin so that we do get conflicts. +%if 0%{?_annotated_build} == 0 +OPTS="$(rpm --eval '%build_cflags %build_ldflags')" +%else +# Disable the standard annobin plugin so that we do not get conflicts. 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. @@ -509,6 +513,9 @@ fi #--------------------------------------------------------------------------------- %changelog +* Tue Dec 20 2022 Nick Clifton - 10.98-3 +- Spec File: Fix building with plugin_rebuild enabled. + * Fri Dec 16 2022 Nick Clifton - 10.98-1 - GCC plugin: Fix building with gcc-13. From 00b41d020b9bced7a37f1cb077a5d3d3e3cda37b Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Wed, 21 Dec 2022 10:25:59 +0100 Subject: [PATCH 5/6] Another test rebuild. --- annobin.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/annobin.spec b/annobin.spec index 8591bbe..74941c9 100644 --- a/annobin.spec +++ b/annobin.spec @@ -2,7 +2,7 @@ Name: annobin Summary: Annotate and examine compiled binary files Version: 10.98 -Release: 3.0.1%{?dist} +Release: 3.0.2%{?dist} License: GPLv3+ URL: https://sourceware.org/annobin/ # Maintainer: nickc@redhat.com @@ -36,9 +36,9 @@ URL: https://sourceware.org/annobin/ # Set this to zero to disable the requirement for a specific version of gcc. # This should only be needed if there is some kind of problem with the version # checking logic or when building on RHEL-7 or earlier. -%global with_hard_gcc_version_requirement 0 +%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. From 4cd53133fc022037e1e6d0626d231696246729d9 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Thu, 22 Dec 2022 15:52:26 +0100 Subject: [PATCH 6/6] Another rebuild. --- annobin.spec | 14 +++++++++----- sources | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/annobin.spec b/annobin.spec index 74941c9..ad805c1 100644 --- a/annobin.spec +++ b/annobin.spec @@ -1,8 +1,8 @@ Name: annobin Summary: Annotate and examine compiled binary files -Version: 10.98 -Release: 3.0.2%{?dist} +Version: 10.99 +Release: 1.0.1%{?dist} License: GPLv3+ URL: https://sourceware.org/annobin/ # Maintainer: nickc@redhat.com @@ -396,10 +396,11 @@ cp gcc-plugin/.libs/annobin.so.0.0.0 %{_tmppath}/tmp_annobin.so make -C gcc-plugin clean BUILD_FLAGS="-fplugin=%{_tmppath}/tmp_annobin.so" -%if 0%{?_annotated_build} == 0 -OPTS="$(rpm --eval '%build_cflags %build_ldflags')" +# 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 +OPTS="$(rpm --eval '%undefine _annotated_build %build_cflags %build_ldflags')" %else -# Disable the standard annobin plugin so that we do not get conflicts. OPTS="$(rpm --undefine=_annotated_build --eval '%build_cflags %build_ldflags')" %endif @@ -513,6 +514,9 @@ fi #--------------------------------------------------------------------------------- %changelog +* Wed Dec 21 2022 Nick Clifton - 10.99-1 +- Annocheck: Improve handling of tool versions. + * Tue Dec 20 2022 Nick Clifton - 10.98-3 - Spec File: Fix building with plugin_rebuild enabled. diff --git a/sources b/sources index f68617a..48309aa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (annobin-10.98.tar.xz) = 523651275dd99e45d1611acdb1196948de034354730d07d7d5fe1f8946647b296532bcef1a3f1d18b7759a7bdf1c33c7574b3073eb7682696527ab67da95caa2 +SHA512 (annobin-10.99.tar.xz) = 601bd90aa4b6528f595efebf5b864aae5176e8e9d80c7f9cf77a1252b85a15c8440866a1f4881176f6bb50418c037e8924f32456533e90de473dae8abe92d53e