From: Kefu Chai <tchaikov@gmail.com>
Date: Mon, 11 Mar 2024 01:48:36 +0000 (+0800)
Subject: ceph.spec.in: use gts_version instead of gts_prefix
X-Git-Tag: v20.0.0~2337^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c8e37d1c6f3e2d6279c098aae47a2e3ab8a57a8a;p=ceph.git

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 <tchaikov@gmail.com>
---

diff --git a/ceph.spec.in b/ceph.spec.in
index 38dd579868cbc..46d9b5e86bc70 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -141,7 +141,7 @@
 %{!?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
 #################################################################################