rpms/annobin
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Annocheck: Skip property note test for GO binaries. (#204300)

Browse Source
This commit is contained in:
Nick Clifton 2022-01-20 15:18:08 +00:00
parent 86fbdc98e6
commit 4852d3d782
2 changed files with 14 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
annobin.spec
View File

@ -1,8 +1,8 @@
Name: annobin Name: annobin
Summary: Annotate and examine compiled binary files Summary: Annotate and examine compiled binary files
Version: 10.48 Version: 10.49
Release: 6%{?dist} Release: 1%{?dist}
License: GPLv3+ License: GPLv3+
# Maintainer: nickc@redhat.com # Maintainer: nickc@redhat.com
# Web Page: https://sourceware.org/annobin/ # Web Page: https://sourceware.org/annobin/
@ -238,14 +238,8 @@ Requires: (gcc >= %{gcc_major} with gcc < %{gcc_next})
Requires: gcc Requires: gcc
%endif %endif
# The next line has been stolen from redhat-rpm-config.spec.
# We install a version info file into this directory, rather than gcc's plugin
# directory, because there is no reliable way for redhat-rpm-config to
# determine the name of gcc's plugin directory.
%global rrcdir /usr/lib/rpm/redhat
# Information about the gcc plugin is recorded in this file. # Information about the gcc plugin is recorded in this file.
%global aver %{rrcdir}/annobin-plugin-version-info %global aver annobin-plugin-version-info
%description plugin-gcc %description plugin-gcc
Installs an annobin plugin that can be used by gcc. Installs an annobin plugin that can be used by gcc.
@ -399,17 +393,6 @@ BUILD_FLAGS="$BUILD_FLAGS -fplugin=annobin -fplugin-arg-annobin-disable"
make -C gcc-plugin CXXFLAGS="%{optflags} $BUILD_FLAGS" make -C gcc-plugin CXXFLAGS="%{optflags} $BUILD_FLAGS"
rm %{_tmppath}/tmp_annobin.so rm %{_tmppath}/tmp_annobin.so
# Record the version of gcc that built this plugin.
mkdir -p %{buildroot}%{rrcdir}
rm -f %{buildroot}%{aver}
# Note - we cannot just store %%{gcc_vr} as sometimes the gcc rpm version changes
# without the NVR being altered. See BZ #2030671 for more discussion on this.
echo `rpm -q gcc --qf '%{version}-%{release}'` > %{buildroot}%{aver}
# Provide a more complete version information string on the second line.
# This is not used by the comparison logic, but makes the file more useful to humans.
echo "%{ANNOBIN_GCC_PLUGIN_DIR}/annobin.so.0.0.0 was built by gcc version %{gcc_vr} from the %{version} sources" >> %{buildroot}%{aver}
%endif %endif
%if %{with clangplugin} %if %{with clangplugin}
@ -422,6 +405,7 @@ cp llvm-plugin/annobin-for-llvm.so %{_tmppath}/tmp_annobin.so
make -C llvm-plugin all CXXFLAGS="%{optflags} $BUILD_FLAGS" make -C llvm-plugin all CXXFLAGS="%{optflags} $BUILD_FLAGS"
%endif %endif
# endif for %%if {with_lugin_rebuild}
%endif %endif
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
@ -439,14 +423,10 @@ mv %{buildroot}/%{llvm_plugin_dir}/annobin-for-clang.so %{buildroot}/%{clang_plu
%if %{with gccplugin} %if %{with gccplugin}
# Record the version of gcc that built this plugin. # Record the version of gcc that built this plugin.
mkdir -p %{buildroot}%{rrcdir}
rm -f %{buildroot}%{aver}
# Note - we cannot just store %%{gcc_vr} as sometimes the gcc rpm version changes # Note - we cannot just store %%{gcc_vr} as sometimes the gcc rpm version changes
# without the NVR being altered. See BZ #2030671 for more discussion on this. # without the NVR being altered. See BZ #2030671 for more discussion on this.
echo `rpm -q gcc --qf '%%{version}-%%{release}'` > %{buildroot}%{aver} mkdir -p %{buildroot}/%{ANNOBIN_GCC_PLUGIN_DIR}
# Provide a more complete version information string on the second line. cat `gcc --print-file-name=rpmver` > %{buildroot}/%{ANNOBIN_GCC_PLUGIN_DIR}/%{aver}
# This is not used by the comparison logic, but makes the file more useful to humans.
echo "%{ANNOBIN_GCC_PLUGIN_DIR}/annobin.so.0.0.0 was built by gcc version %{gcc_vr} from the %{version} sources" >> %{buildroot}%{aver}
# Also install a copy of the sources into the build tree. # Also install a copy of the sources into the build tree.
mkdir -p %{buildroot}%{annobin_source_dir} mkdir -p %{buildroot}%{annobin_source_dir}
@ -493,8 +473,10 @@ fi
%if %{with gccplugin} %if %{with gccplugin}
%files plugin-gcc %files plugin-gcc
%{ANNOBIN_GCC_PLUGIN_DIR} %{ANNOBIN_GCC_PLUGIN_DIR}/annobin.so
%{aver} %{ANNOBIN_GCC_PLUGIN_DIR}/annobin.so.0
%{ANNOBIN_GCC_PLUGIN_DIR}/annobin.so.0.0.0
%{ANNOBIN_GCC_PLUGIN_DIR}/%{aver}
%{annobin_source_dir}/latest-annobin.tar.xz %{annobin_source_dir}/latest-annobin.tar.xz
%endif %endif
@ -509,6 +491,9 @@ fi
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
%changelog %changelog
* Thu Jan 20 2022 Nick Clifton <nickc@redhat.com> - 10.49-1
- Annocheck: Skip property note test for GO binaries. (#204300)
* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 10.48-6 * Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 10.48-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

2
sources
View File

@ -1 +1 @@
SHA512 (annobin-10.48.tar.xz) = e77af4e9aa6e4176b56e1afd3b9f60e2b1e3b89dde709a3a9ca320665b4b9eed87111aeb972ce1e1d9fd95183b7682102cf7fa02c51cec493f54cba44db6d2af SHA512 (annobin-10.49.tar.xz) = f1c1f29a1b7dcda2ed95a2090ea8e273164c34dc75397d68d0ecda1639d9da2985bc516982bab3e85357a5c6ee7084039c90355575c3625e46b09ebb8295d878