Skip to content

Commit f9b9bf3

Browse files
committed
rpm: require gcc >= 13.3 regardless of gts_version
when gts_version is not set, bump the required version of gcc-c++ >= 13.3. move this into a `%if 0%{?gts_version} == 0` block to prevent that from applying to builds using gts, because the distro probably doesn't provide a recent enough gcc-c++ Signed-off-by: Casey Bodley <[email protected]>
1 parent 897188f commit f9b9bf3

File tree

1 file changed

+3
-11
lines changed

1 file changed

+3
-11
lines changed

ceph.spec.in

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -239,24 +239,16 @@ BuildRequires: cmake > 3.5
239239
BuildRequires: fuse-devel
240240
BuildRequires: git
241241
BuildRequires: grpc-devel
242-
%if 0%{?fedora} || 0%{?suse_version} > 1500 || 0%{?rhel} == 9 || 0%{?openEuler}
243-
BuildRequires: gcc-c++ >= 11
244-
%endif
245-
%if 0%{?suse_version} == 1500
246-
BuildRequires: gcc11-c++
247-
%endif
248-
%if 0%{?gts_version} > 0
249-
%if 0%{?gts_version} == 13
250242
# Before 13.3, an lto bug resulted in a segfault in SafeTimer and perhaps
251243
# elsewhere. Require the fixed version so we can reenable lto. See
252244
# ceph bug https://tracker.ceph.com/issues/63867
253245
# and
254246
# gcc bug https://bugzilla.redhat.com/show_bug.cgi?id=2241339
255247
# for details.
256-
BuildRequires: gcc-toolset-%{gts_version}-gcc-c++ >= 13.3
248+
%if 0%{?gts_version} == 0
249+
BuildRequires: gcc-c++ >= 13.3
257250
%else
258-
BuildRequires: gcc-toolset-%{gts_version}-gcc-c++
259-
%endif
251+
BuildRequires: gcc-toolset-%{gts_version}-gcc-c++ >= 13.3
260252
BuildRequires: gcc-toolset-%{gts_version}-runtime
261253
BuildRequires: gcc-toolset-%{gts_version}-libatomic-devel
262254
%endif

0 commit comments

Comments
 (0)