]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph.spec.in: use gts_version instead of gts_prefix
authorKefu Chai <tchaikov@gmail.com>
Mon, 11 Mar 2024 01:48:36 +0000 (09:48 +0800)
committerKefu Chai <tchaikov@gmail.com>
Mon, 11 Mar 2024 01:48:36 +0000 (09:48 +0800)
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 <tchaikov@gmail.com>
ceph.spec.in

index 38dd579868cbce7fbc2b2b1400cff5f62ec9aaec..46d9b5e86bc708db377783992d0b5b04cc8c66e7 100644 (file)
 %{!?python3_pkgversion: %global python3_pkgversion 3}
 %{!?python3_version_nodots: %global python3_version_nodots 3}
 %{!?python3_version: %global python3_version 3}
-%{!?gts_prefix: %global gts_prefix gcc-toolset-11}
+%{!?gts_version: %global gts_version 11}
 
 %if ! 0%{?suse_version}
 # use multi-threaded xz compression: xz level 7 using ncpus threads
@@ -230,9 +230,9 @@ BuildRequires:      gcc-c++ >= 11
 BuildRequires: gcc11-c++
 %endif
 %if 0%{?rhel} == 8
-BuildRequires: %{gts_prefix}-gcc-c++
-BuildRequires: %{gts_prefix}-build
-BuildRequires: %{gts_prefix}-libatomic-devel
+BuildRequires: gcc-toolset-%{gts_version}-gcc-c++
+BuildRequires: gcc-toolset-%{gts_version}-build
+BuildRequires: gcc-toolset-%{gts_version}-libatomic-devel
 %endif
 %if 0%{?fedora} || 0%{?rhel} == 9 || 0%{?openEuler}
 BuildRequires:  libatomic
@@ -359,10 +359,10 @@ BuildRequires:  libasan
 BuildRequires:  protobuf-devel
 BuildRequires:  protobuf-compiler
 %if 0%{?rhel} == 8
-BuildRequires:  %{gts_prefix}-annobin
-BuildRequires:  %{gts_prefix}-annobin-plugin-gcc
-BuildRequires:  %{gts_prefix}-libubsan-devel
-BuildRequires:  %{gts_prefix}-libasan-devel
+BuildRequires:  gcc-toolset-%{gts_version}-annobin
+BuildRequires:  gcc-toolset-%{gts_version}-annobin-plugin-gcc
+BuildRequires:  gcc-toolset-%{gts_version}-libubsan-devel
+BuildRequires:  gcc-toolset-%{gts_version}-libasan-devel
 %endif
 %endif
 #################################################################################