Annocheck: Do not set CFLAGS/LDFLAGS when building. Take from environment instead.
This commit is contained in:
parent
92cb681581
commit
a99d618d38
26
annobin.spec
26
annobin.spec
@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
Name: annobin
|
Name: annobin
|
||||||
Summary: Annotate and examine compiled binary files
|
Summary: Annotate and examine compiled binary files
|
||||||
Version: 10.02
|
Version: 10.03
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
License: GPLv3+
|
License: GPLv3+
|
||||||
# Maintainer: nickc@redhat.com
|
# Maintainer: nickc@redhat.com
|
||||||
@ -47,12 +47,14 @@ License: GPLv3+
|
|||||||
# was built is different from the version of gcc that is now being used, and
|
# was built is different from the version of gcc that is now being used, and
|
||||||
# then it will abort.
|
# then it will abort.
|
||||||
#
|
#
|
||||||
# The default was to use plugin during rebuilds (cf BZ 1630550) but this has
|
# The default is to use plugin during rebuilds (cf BZ 1630550) but this can
|
||||||
# been changed because of the need to be able to rebuild annobin when a change
|
# be changed because of the need to be able to rebuild annobin when a change
|
||||||
# to gcc breaks the version installed into the buildroot.
|
# to gcc breaks the version installed into the buildroot. Mote however that
|
||||||
%if %{without plugin_rebuild}
|
# uncommenting the lines below will result in annocheck not passing the rpminspect
|
||||||
%undefine _annotated_build
|
# tests....
|
||||||
%endif
|
# %%if %%{without plugin_rebuild}
|
||||||
|
# %%undefine _annotated_build
|
||||||
|
# %%endif
|
||||||
|
|
||||||
#---------------------------------------------------------------------------------
|
#---------------------------------------------------------------------------------
|
||||||
|
|
||||||
@ -346,8 +348,6 @@ CONFIG_ARGS="$CONFIG_ARGS --with-llvm"
|
|||||||
CONFIG_ARGS="$CONFIG_ARGS --without-test"
|
CONFIG_ARGS="$CONFIG_ARGS --without-test"
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
export CFLAGS="$CFLAGS $RPM_OPT_FLAGS"
|
|
||||||
|
|
||||||
%if %{without annocheck}
|
%if %{without annocheck}
|
||||||
CONFIG_ARGS="$CONFIG_ARGS --without-annocheck"
|
CONFIG_ARGS="$CONFIG_ARGS --without-annocheck"
|
||||||
%else
|
%else
|
||||||
@ -359,12 +359,15 @@ export CFLAGS="$CFLAGS -DAARCH64_BRANCH_PROTECTION_SUPPORTED=1"
|
|||||||
|
|
||||||
%set_build_flags
|
%set_build_flags
|
||||||
|
|
||||||
|
export CFLAGS="$CFLAGS $RPM_OPT_FLAGS %build_cflags"
|
||||||
|
export LDFLAGS="$LDFLAGS %build_ldflags"
|
||||||
|
|
||||||
%ifarch %{ix86} x86_64
|
%ifarch %{ix86} x86_64
|
||||||
# FIXME: There should be a better way to do this.
|
# FIXME: There should be a better way to do this.
|
||||||
export CLANG_TARGET_OPTIONS="-fcf-protection"
|
export CLANG_TARGET_OPTIONS="-fcf-protection"
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%configure ${CONFIG_ARGS} || cat config.log
|
CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" CXXFLAGS="$CFLAGS" %configure ${CONFIG_ARGS} || cat config.log
|
||||||
|
|
||||||
%make_build
|
%make_build
|
||||||
|
|
||||||
@ -489,6 +492,9 @@ fi
|
|||||||
#---------------------------------------------------------------------------------
|
#---------------------------------------------------------------------------------
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Sep 15 2021 Nick Clifton <nickc@redhat.com> - 10.03-1
|
||||||
|
- Annocheck: Do not set CFLAGS/LDFLAGS when building. Take from environment instead.
|
||||||
|
|
||||||
* Fri Sep 10 2021 Nick Clifton <nickc@redhat.com> - 10.02-1
|
* Fri Sep 10 2021 Nick Clifton <nickc@redhat.com> - 10.02-1
|
||||||
- Annocheck: Fix exit code when tests PASS.
|
- Annocheck: Fix exit code when tests PASS.
|
||||||
|
|
||||||
|
2
sources
2
sources
@ -1 +1 @@
|
|||||||
SHA512 (annobin-10.02.tar.xz) = c6a6803b62fb1d2f8a35243e9178c36c353c2c12e670c51e9c4c7c56f710d0c14eaa71de8557aa2702144d591eba048049bb8e69eb6b45a6acbadbb13bb71629
|
SHA512 (annobin-10.03.tar.xz) = 5341b38c4b7c1799987d3c31d298bd740c941d3c2fe65cdfcf92e580801f8af5401ad9ebf88240f3330a0aeb3f95fd188cbd24f011826aadbbe7257c31cc478d
|
||||||
|
Loading…
Reference in New Issue
Block a user