Skip to content

Commit c8e37d1

Browse files
committed
ceph.spec.in: use gts_version instead of gts_prefix
since we are going to use different gcc-toolset versions on rhel8 and on rhel9, and the subpackage names of gcc-toolset changed across gts 11 and gts 13, let's prepare for this change. Signed-off-by: Kefu Chai <[email protected]>
1 parent cb2b48d commit c8e37d1

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

ceph.spec.in

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@
141141
%{!?python3_pkgversion: %global python3_pkgversion 3}
142142
%{!?python3_version_nodots: %global python3_version_nodots 3}
143143
%{!?python3_version: %global python3_version 3}
144-
%{!?gts_prefix: %global gts_prefix gcc-toolset-11}
144+
%{!?gts_version: %global gts_version 11}
145145

146146
%if ! 0%{?suse_version}
147147
# use multi-threaded xz compression: xz level 7 using ncpus threads
@@ -230,9 +230,9 @@ BuildRequires: gcc-c++ >= 11
230230
BuildRequires: gcc11-c++
231231
%endif
232232
%if 0%{?rhel} == 8
233-
BuildRequires: %{gts_prefix}-gcc-c++
234-
BuildRequires: %{gts_prefix}-build
235-
BuildRequires: %{gts_prefix}-libatomic-devel
233+
BuildRequires: gcc-toolset-%{gts_version}-gcc-c++
234+
BuildRequires: gcc-toolset-%{gts_version}-build
235+
BuildRequires: gcc-toolset-%{gts_version}-libatomic-devel
236236
%endif
237237
%if 0%{?fedora} || 0%{?rhel} == 9 || 0%{?openEuler}
238238
BuildRequires: libatomic
@@ -359,10 +359,10 @@ BuildRequires: libasan
359359
BuildRequires: protobuf-devel
360360
BuildRequires: protobuf-compiler
361361
%if 0%{?rhel} == 8
362-
BuildRequires: %{gts_prefix}-annobin
363-
BuildRequires: %{gts_prefix}-annobin-plugin-gcc
364-
BuildRequires: %{gts_prefix}-libubsan-devel
365-
BuildRequires: %{gts_prefix}-libasan-devel
362+
BuildRequires: gcc-toolset-%{gts_version}-annobin
363+
BuildRequires: gcc-toolset-%{gts_version}-annobin-plugin-gcc
364+
BuildRequires: gcc-toolset-%{gts_version}-libubsan-devel
365+
BuildRequires: gcc-toolset-%{gts_version}-libasan-devel
366366
%endif
367367
%endif
368368
#################################################################################

0 commit comments

Comments
 (0)