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

Spec File: Fix building with plugin_rebuild enabled.

Browse Source
This commit is contained in:
Nick Clifton 2022-12-20 11:00:37 +00:00
parent be2978da15
commit 5271f2bc79
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
annobin.spec
View File

@ -2,7 +2,7 @@
Name: annobin Name: annobin
Summary: Annotate and examine compiled binary files Summary: Annotate and examine compiled binary files
Version: 10.98 Version: 10.98
Release: 1%{?dist} Release: 2%{?dist}
License: GPLv3+ License: GPLv3+
URL: https://sourceware.org/annobin/ URL: https://sourceware.org/annobin/
# Maintainer: nickc@redhat.com # Maintainer: nickc@redhat.com
@ -38,7 +38,7 @@ URL: https://sourceware.org/annobin/
# checking logic or when building on RHEL-7 or earlier. # checking logic or when building on RHEL-7 or earlier.
%global with_hard_gcc_version_requirement 1 %global with_hard_gcc_version_requirement 1
%bcond_with plugin_rebuild %bcond_without plugin_rebuild
# Allow the building of annobin without using annobin itself. # Allow the building of annobin without using annobin itself.
# This is because if we are bootstrapping a new build environment we can have # 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. # 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 make -C gcc-plugin clean
BUILD_FLAGS="-fplugin=%{_tmppath}/tmp_annobin.so" 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 '%undefine _annotated_build %build_cflags %build_ldflags')" OPTS="$(rpm --eval '%build_cflags %build_ldflags')"
%else
# Disable the standard annobin plugin so that we do not get conflicts.
OPTS="$(rpm --eval '%undefine _annotated_build %%build_cflags %build_ldflags')"
%endif
# If building on systems with an assembler that does not support the # 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. # .attach_to_group pseudo op (eg RHEL-7) then enable the next line.
@ -509,6 +513,9 @@ fi
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
%changelog %changelog
* Tue Dec 20 2022 Nick Clifton <nickc@redhat.com> - 10.98-2
- Spec File: Fix building with plugin_rebuild enabled.
* Fri Dec 16 2022 Nick Clifton <nickc@redhat.com> - 10.98-1 * Fri Dec 16 2022 Nick Clifton <nickc@redhat.com> - 10.98-1
- GCC plugin: Fix building with gcc-13. - GCC plugin: Fix building with gcc-13.