From 336fe86af86c6e7becd8c3f9e8c88db4f22fbe02 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Thu, 4 Aug 2022 09:00:29 +0800 Subject: [PATCH] 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 --- ceph.spec.in | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ceph.spec.in b/ceph.spec.in index 136b033b267ea..4538d30afe466 100644 --- 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 -- 2.39.5