]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph.spec.in: use gcc-toolset-11 for building crimson
authorRadosław Zarzyński <rzarzyns@redhat.com>
Tue, 31 May 2022 10:21:41 +0000 (12:21 +0200)
committerDavid Galloway <dgallowa@redhat.com>
Wed, 10 Aug 2022 19:57:50 +0000 (15:57 -0400)
Signed-off-by: Radosław Zarzyński <rzarzyns@redhat.com>
(cherry picked from commit 13f3653f59f61c1f7e90c05e37e43e0ef912d1ea)

ceph.spec.in

index d3f63b7bb2e7d3f3425b3955e1196110164bb7c4..29e10f124660bd286d91c71b792e4bd3f23d1d98 100644 (file)
@@ -201,7 +201,7 @@ BuildRequires:      gperf
 BuildRequires:  cmake > 3.5
 BuildRequires: fuse-devel
 %if 0%{with seastar} && 0%{?rhel}
-BuildRequires: gcc-toolset-10-gcc-c++ >= 10.3.1-1.2
+BuildRequires: gcc-toolset-11-gcc-c++
 %else
 %if 0%{?suse_version}
 BuildRequires: gcc11-c++
@@ -324,10 +324,10 @@ BuildRequires:  libasan
 BuildRequires:  libatomic
 %endif
 %if 0%{?rhel}
-BuildRequires:  gcc-toolset-10-annobin
-BuildRequires:  gcc-toolset-10-libubsan-devel
-BuildRequires:  gcc-toolset-10-libasan-devel
-BuildRequires:  gcc-toolset-10-libatomic-devel
+BuildRequires:  gcc-toolset-11-annobin-plugin-gcc
+BuildRequires:  gcc-toolset-11-libubsan-devel
+BuildRequires:  gcc-toolset-11-libasan-devel
+BuildRequires:  gcc-toolset-11-libatomic-devel
 %endif
 %endif
 #################################################################################
@@ -1259,7 +1259,7 @@ This package provides Ceph default alerts for Prometheus.
 %endif
 
 %if 0%{with seastar} && 0%{?rhel}
-. /opt/rh/gcc-toolset-10/enable
+. /opt/rh/gcc-toolset-11/enable
 %endif
 
 %if 0%{with cephfs_java}