From: Radoslaw Zarzynski <rzarzyns@redhat.com>
Date: Tue, 28 Jun 2022 01:15:15 +0000 (+0000)
Subject: ceph.spec.in: move and undef _annotated_build only for rhels.
X-Git-Tag: v18.0.0~611^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ddf3721a9649b9b29593f17e663a1f0bf20afc19;p=ceph.git

ceph.spec.in: move and undef _annotated_build only for rhels.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
---

diff --git a/ceph.spec.in b/ceph.spec.in
index b3a1f7849d01..65007964b3be 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -145,13 +145,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
 #################################################################################
@@ -1279,6 +1272,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