]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph.spec.in: move and undef _annotated_build only for rhels.
authorRadoslaw Zarzynski <rzarzyns@redhat.com>
Tue, 28 Jun 2022 01:15:15 +0000 (01:15 +0000)
committerDavid Galloway <dgallowa@redhat.com>
Wed, 10 Aug 2022 20:46:46 +0000 (16:46 -0400)
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
(cherry picked from commit ddf3721a9649b9b29593f17e663a1f0bf20afc19)

ceph.spec.in

index 61f36e7f0824c977134e30d48a4fbafb0feaf7ea..88cce47062397f9efbb99caa7b64c1e5735a9cce 100644 (file)
 %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