From 55778e20c237f12f2462aedee3dfc27ca95c870b Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Wed, 10 Aug 2022 22:44:59 +0800 Subject: [PATCH] ceph.spec.in: define %gts_prefix less repeatings this way, also allow maintainer to use other version of GTS. Signed-off-by: Kefu Chai (cherry picked from commit 53302f5f7f793aea73f521e8403eedda42357a92) --- ceph.spec.in | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/ceph.spec.in b/ceph.spec.in index 56e5a085e937b..0fd4271af45e9 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -122,6 +122,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} %if ! 0%{?suse_version} # use multi-threaded xz compression: xz level 7 using ncpus threads @@ -205,10 +206,10 @@ BuildRequires: fuse-devel BuildRequires: gcc-c++ >= 11 %endif %if 0%{?rhel} >= 8 -BuildRequires: gcc-toolset-11-gcc-c++ -BuildRequires: gcc-toolset-11-build +BuildRequires: %{gts_prefix}-gcc-c++ +BuildRequires: %{gts_prefix}-build %ifarch aarch64 -BuildRequires: gcc-toolset-11-libatomic-devel +BuildRequires: %{gts_prefix}-libatomic-devel %endif %endif %if 0%{?fedora} @@ -328,10 +329,10 @@ BuildRequires: libubsan BuildRequires: libasan %endif %if 0%{?rhel} -BuildRequires: gcc-toolset-11-annobin -BuildRequires: gcc-toolset-11-annobin-plugin-gcc -BuildRequires: gcc-toolset-11-libubsan-devel -BuildRequires: gcc-toolset-11-libasan-devel +BuildRequires: %{gts_prefix}-annobin +BuildRequires: %{gts_prefix}-annobin-plugin-gcc +BuildRequires: %{gts_prefix}-libubsan-devel +BuildRequires: %{gts_prefix}-libasan-devel %endif %endif ################################################################################# -- 2.39.5