From b0d20eac18e1b2609c16534f7ccf9aa7a2d012ad Mon Sep 17 00:00:00 2001 From: Radoslaw Zarzynski Date: Tue, 28 Jun 2022 01:15:15 +0000 Subject: [PATCH] ceph.spec.in: move and undef _annotated_build only for rhels. Signed-off-by: Radoslaw Zarzynski (cherry picked from commit ddf3721a9649b9b29593f17e663a1f0bf20afc19) --- ceph.spec.in | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/ceph.spec.in b/ceph.spec.in index 61f36e7f0824c..88cce47062397 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -149,13 +149,6 @@ %endif %endif -%if 0%{with seastar} -# disable -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1, as gcc-toolset-{9,10}-annobin -# do not provide gcc-annobin.so anymore, despite that they provide annobin.so. but -# redhat-rpm-config still passes -fplugin=gcc-annobin to the compiler. -%undefine _annotated_build -%endif - ################################################################################# # main package definition ################################################################################# @@ -1284,6 +1277,12 @@ export CXXFLAGS=$(echo $RPM_OPT_FLAGS | sed -e 's/-Wp,-D_FORTIFY_SOURCE=2//g') # remove from CFLAGS too because it causes the arrow submodule to fail with: # warning _FORTIFY_SOURCE requires compiling with optimization (-O) export CFLAGS=$(echo $RPM_OPT_FLAGS | sed -e 's/-Wp,-D_FORTIFY_SOURCE=2//g') +%if 0%{?fedora} || 0%{?rhel} +# disable -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1, as gcc-toolset-{9,10}-annobin +# do not provide gcc-annobin.so anymore, despite that they provide annobin.so. but +# redhat-rpm-config still passes -fplugin=gcc-annobin to the compiler. +%undefine _annotated_build +%endif %endif env | sort -- 2.39.5