From 50a4793ba298ac43211ae5d08d0ee1538ddccbf1 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Tue, 25 Sep 2018 10:17:37 +0100 Subject: [PATCH] Make annocheck ignore symbols suffixed with ".end". --- .gitignore | 1 + annobin.spec | 36 +++++++++++++++++++++++------------- sources | 2 +- 3 files changed, 25 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index ec0d59e..de9cecb 100644 --- a/.gitignore +++ b/.gitignore @@ -73,3 +73,4 @@ /annobin-8.37.tar.xz /annobin-8.38.tar.xz /annobin-8.39.tar.xz +/annobin-8.41.tar.xz diff --git a/annobin.spec b/annobin.spec index 8ba5726..6319d8e 100644 --- a/annobin.spec +++ b/annobin.spec @@ -1,17 +1,21 @@ -# Do not build the annobin plugin with annotation enabled. -# 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. -# (ie we are building the new version of annobin to go with the new version -# of gcc). If the *old* annobin plugin is used whilst building this new -# version, the old plugin will complain that version of gcc for which it -# was built is different from the version of gcc that is now being used, and -# then it will abort. -%undefine _annotated_build +# Suppress this for BZ 1630550. +# The problem should now only arise when rebasing to a new majopr version +# of gcc, in which case the undefine below can be temporarily reinstated. +# +# # Do not build the annobin plugin with annotation enabled. +# # 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. +# # (ie we are building the new version of annobin to go with the new version +# # of gcc). If the *old* annobin plugin is used whilst building this new +# # version, the old plugin will complain that version of gcc for which it +# # was built is different from the version of gcc that is now being used, and +# # then it will abort. +# %%undefine _annotated_build Name: annobin Summary: Binary annotation plugin for GCC -Version: 8.39 +Version: 8.41 Release: 1%{?dist} License: GPLv3+ @@ -155,10 +159,10 @@ touch doc/annobin.info # double annotations in it. (If the build system enables annotations # for plugins by default). I have not tested this yet, but I think # that it should be OK. -cp plugin/.libs/annobin.so.0.0.0 %{_tmppath}/tmp-annobin.so +cp plugin/.libs/annobin.so.0.0.0 %{_tmppath}/tmp_annobin.so make -C plugin clean -make -C plugin CXXFLAGS="%{optflags} -fplugin=%{_tmppath}/tmp-annobin.so" -rm %{_tmppath}/tmp-annobin.so +make -C plugin CXXFLAGS="%{optflags} -fplugin=%{_tmppath}/tmp_annobin.so -fplugin-arg-tmp_annobin-rename" +rm %{_tmppath}/tmp_annobin.so #--------------------------------------------------------------------------------- @@ -200,6 +204,12 @@ make check #--------------------------------------------------------------------------------- %changelog +* Tue Sep 25 2018 Nick Clifton - 8.41-1 +- Make annocheck ignore symbols suffixed with ".end". (#1639618) + +* Mon Sep 24 2018 Nick Clifton - 8.40-1 +- Reinstate building annobin with annobin enabled. (#1630550) + * Fri Sep 21 2018 Nick Clifton - 8.39-1 - Tweak tests. diff --git a/sources b/sources index 3f93827..cd6fcc5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (annobin-8.39.tar.xz) = 0f8e2f1088f461e939b4ed46e13022975fa55fc63ff106d6abb6523db33faef3ae92388ca36fcd5de48d87d5cbc4ca2166205cae3c395f35edb9df0e01dc15b5 +SHA512 (annobin-8.41.tar.xz) = 457337b457261f7c93a3c6beeaf810a05e74f76e05dbe0d3951d121a071188fec31527b1dfe3fdc60d4756159a30d75ad89e43f7c9edd3b077fd39606ffe10cf