ceph.spec.in: call %enable_devtoolset11 on centos8

before this change %enable_devtoolset11 is called only when building
with crimson on centos8.

after this change %enable_devtoolset11 is called when building on
centos8. because we've started using gcc-toolset-11 for building
rpm packages on centos8 after the C++20 migration. so, to build
with gcc-11, we need to enable it.

also, because gcc-toolset-11 is used, we have to disable
annotated_build.

Signed-off-by: Kefu Chai <tchaikov@gmail.com>

diff --git a/ceph.spec.in b/ceph.spec.in
index 136b033b267ea72ad732dd1520cf49bc2a127e0a..4538d30afe46643b2fb5f8b787c01449f86c0739 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -149,15 +149,13 @@
 %endif
 %endif
 
-%if 0%{with seastar}
 # disable -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1, as gcc-toolset-{10,11}-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
-%if 0%{?enable_devtoolset11:1}
+%if 0%{?rhel} >= 8
 %enable_devtoolset11
 %endif
-%endif
 
 #################################################################################
 # main package definition