Skip to content

Commit 77c6ef8

Browse files
committed
rpm: remove special cases for gts_version < 13
now that we no longer set gts_version to 11, remove any special cases for gts_version < 13 Signed-off-by: Casey Bodley <[email protected]>
1 parent 1b5f1eb commit 77c6ef8

File tree

1 file changed

+0
-13
lines changed

1 file changed

+0
-13
lines changed

ceph.spec.in

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -195,10 +195,6 @@
195195
%if 0%{?enable_devtoolset13:1}
196196
%enable_devtoolset13
197197
%endif
198-
%else
199-
%if 0%{?enable_devtoolset11:1}
200-
%enable_devtoolset11
201-
%endif
202198
%endif
203199
%endif
204200

@@ -267,11 +263,7 @@ BuildRequires: gcc-toolset-%{gts_version}-gcc-c++ >= 13.3
267263
%else
268264
BuildRequires: gcc-toolset-%{gts_version}-gcc-c++
269265
%endif
270-
%if 0%{?gts_version} >= 12
271266
BuildRequires: gcc-toolset-%{gts_version}-runtime
272-
%else
273-
BuildRequires: gcc-toolset-%{gts_version}-build
274-
%endif
275267
BuildRequires: gcc-toolset-%{gts_version}-libatomic-devel
276268
%endif
277269
%if 0%{?fedora} || 0%{?rhel} == 9 || 0%{?openEuler}
@@ -399,12 +391,7 @@ BuildRequires: libasan
399391
BuildRequires: protobuf-devel
400392
BuildRequires: protobuf-compiler
401393
%if 0%{?gts_version} > 0
402-
%if 0%{?gts_version} >= 12
403394
BuildRequires: gcc-toolset-%{gts_version}-gcc-plugin-annobin
404-
%else
405-
BuildRequires: gcc-toolset-%{gts_version}-annobin
406-
BuildRequires: gcc-toolset-%{gts_version}-annobin-plugin-gcc
407-
%endif
408395
BuildRequires: gcc-toolset-%{gts_version}-libubsan-devel
409396
BuildRequires: gcc-toolset-%{gts_version}-libasan-devel
410397
%endif

0 commit comments

Comments
 (0)