Version number bump so that the plugin can be rebuilt with the latest version of GCC.

This commit is contained in:
Nick Clifton 2018-05-03 12:56:54 +01:00
parent f45ff6be28
commit 967f47d659

View File

@ -12,7 +12,7 @@
Name: annobin
Summary: Binary annotation plugin for GCC
Version: 5.6
Release: 2%{?dist}
Release: 3%{?dist}
License: GPLv3+
URL: https://fedoraproject.org/wiki/Toolchain/Watermark
@ -115,6 +115,8 @@ BuildRequires: gcc == %{gcc_vr}
Requires: gcc
%endif
#---------------------------------------------------------------------------------
%prep
%autosetup -p1
@ -126,6 +128,8 @@ touch configure */configure Makefile.in */Makefile.in
# Similarly we do not want to rebuild the documentation.
touch doc/annobin.info
#---------------------------------------------------------------------------------
%build
%configure --quiet --with-gcc-plugin-dir=%{ANNOBIN_PLUGIN_DIR}
%make_build
@ -133,33 +137,42 @@ touch doc/annobin.info
# ensures that the plugin works, and that it contains annotations
# of its own. This could mean that we end up with a plugin with
# double annotations in it. (If the build system enables annotations
# for plugins by default). I have not tested this, but I think that
# it should be OK.
# 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
make -C plugin clean
make -C plugin CXXFLAGS="%{optflags} -fplugin=%{_tmppath}/tmp-annobin.so"
rm %{_tmppath}/tmp-annobin.so
#---------------------------------------------------------------------------------
%install
%make_install
%{__rm} -f %{buildroot}%{_infodir}/dir
#---------------------------------------------------------------------------------
%if %{with tests}
%check
make check
%endif
#---------------------------------------------------------------------------------
%post
/sbin/install-info %{_infodir}/annobin.info.gz %{_infodir} >/dev/null 2>&1 || :
exit 0
#---------------------------------------------------------------------------------
%preun
if [ $1 = 0 ]; then
/sbin/install-info --delete %{_infodir}/annobin.info.gz %{_infodir} >/dev/null 2>&1|| :
fi
exit 0
#---------------------------------------------------------------------------------
%files
%{ANNOBIN_PLUGIN_DIR}
%{_bindir}/built-by.sh
@ -178,7 +191,11 @@ exit 0
%doc %{_mandir}/man1/run-on-binaries.1.gz
#---------------------------------------------------------------------------------
%changelog
* Thu May 03 2018 Nick Clifton <nickc@redhat.com> - 5.6-3
- Version number bump so that the plugin can be rebuilt with the latest version of GCC.
* Mon Apr 30 2018 Nick Clifton <nickc@redhat.com> - 5.6-2
- Rebuild the plugin with the newly created plugin enabled. (#1573082)