From 8752d7dc4e3c62c7ec31f1592d6674a2a8361b36 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Tue, 19 Aug 2025 09:44:52 -0400 Subject: [PATCH] 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 (cherry picked from commit f9b9bf3c6a947a483cedc00399f9d370e5158d5b) --- ceph.spec.in | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/ceph.spec.in b/ceph.spec.in index 9641d7cb53b..4ab5f3a102a 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -239,24 +239,16 @@ BuildRequires: cmake > 3.5 BuildRequires: fuse-devel BuildRequires: git BuildRequires: grpc-devel -%if 0%{?fedora} || 0%{?suse_version} > 1500 || 0%{?rhel} == 9 || 0%{?openEuler} -BuildRequires: gcc-c++ >= 11 -%endif -%if 0%{?suse_version} == 1500 -BuildRequires: gcc11-c++ -%endif -%if 0%{?gts_version} > 0 -%if 0%{?gts_version} == 13 # Before 13.3, an lto bug resulted in a segfault in SafeTimer and perhaps # elsewhere. Require the fixed version so we can reenable lto. See # ceph bug https://tracker.ceph.com/issues/63867 # and # gcc bug https://bugzilla.redhat.com/show_bug.cgi?id=2241339 # for details. -BuildRequires: gcc-toolset-%{gts_version}-gcc-c++ >= 13.3 +%if 0%{?gts_version} == 0 +BuildRequires: gcc-c++ >= 13.3 %else -BuildRequires: gcc-toolset-%{gts_version}-gcc-c++ -%endif +BuildRequires: gcc-toolset-%{gts_version}-gcc-c++ >= 13.3 BuildRequires: gcc-toolset-%{gts_version}-runtime BuildRequires: gcc-toolset-%{gts_version}-libatomic-devel %endif -- 2.39.5