From ad715020c91932676919a3ebd225524a441a3604 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rados=C5=82aw=20Zarzy=C5=84ski?= Date: Tue, 31 May 2022 12:21:41 +0200 Subject: [PATCH] ceph.spec.in: use gcc-toolset-11 for building crimson MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Radosław Zarzyński (cherry picked from commit 13f3653f59f61c1f7e90c05e37e43e0ef912d1ea) --- ceph.spec.in | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ceph.spec.in b/ceph.spec.in index d3f63b7bb2e7d..29e10f124660b 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -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} -- 2.39.5