RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-23 19:17:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #45676 from rzarzynski/wip-crimson-toolset-10

Browse Source 
ceph.spec.in: use gcc-toolset-10 for building crimson

Reviewed-by: Kefu Chai <tchaikov@gmail.com>
This commit is contained in:
Kefu Chai 2022-03-29 17:03:14 +08:00 committed by GitHub
commit 1651ce5b03
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ceph.spec.in
View File

@ -186,7 +186,7 @@ BuildRequires: gperf
BuildRequires: cmake > 3.5
BuildRequires: fuse-devel
%if 0%{with seastar} && 0%{?rhel}
BuildRequires: gcc-toolset-9-gcc-c++ >= 9.2.1-2.3
BuildRequires: gcc-toolset-10-gcc-c++ >= 10.3.1-1.2
%else
BuildRequires: gcc-c++
%endif
@ -304,10 +304,10 @@ BuildRequires: libasan
BuildRequires: libatomic
%endif
%if 0%{?rhel}
BuildRequires: gcc-toolset-9-annobin
BuildRequires: gcc-toolset-9-libubsan-devel
BuildRequires: gcc-toolset-9-libasan-devel
BuildRequires: gcc-toolset-9-libatomic-devel
BuildRequires: gcc-toolset-10-annobin
BuildRequires: gcc-toolset-10-libubsan-devel
BuildRequires: gcc-toolset-10-libasan-devel
BuildRequires: gcc-toolset-10-libatomic-devel
%endif
%endif
#################################################################################
@ -1239,7 +1239,7 @@ This package provides Ceph default alerts for Prometheus.
%endif
%if 0%{with seastar} && 0%{?rhel}
. /opt/rh/gcc-toolset-9/enable
. /opt/rh/gcc-toolset-10/enable
%endif
%if 0%{with cephfs_java}