Skip to content

Instantly share code, notes, and snippets.

@ronen-fr
Created January 1, 2026 12:31
Show Gist options
  • Select an option

  • Save ronen-fr/4a8987af6551cc734cd3bfef8c19363b to your computer and use it in GitHub Desktop.

Select an option

Save ronen-fr/4a8987af6551cc734cd3bfef8c19363b to your computer and use it in GitHub Desktop.
Q&D fix to ceph.spec.in for Fedora 43
diff --git a/ceph.spec.in b/ceph.spec.in
index 45435898907..513e1874fc1 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -151,7 +151,7 @@
%{!?python3_version_nodots: %global python3_version_nodots 3}
%{!?python3_version: %global python3_version 3}
%if 0%{?rhel} < 10
-%{!?gts_version: %global gts_version 13}
+%{!?gts_version: %global gts_version 15}
%endif
%if ! 0%{?suse_version}
@@ -185,9 +185,9 @@
# redhat-rpm-config still passes -fplugin=gcc-annobin to the compiler.
%undefine _annotated_build
%if 0%{?gts_version} > 0
-%if 0%{gts_version} == 13
-%if 0%{?enable_devtoolset13:1}
-%enable_devtoolset13
+%if 0%{gts_version} == 15
+%if 0%{?enable_devtoolset15:1}
+%enable_devtoolset15
%endif
%endif
%endif
@@ -245,13 +245,13 @@ BuildRequires: grpc-devel
# and
# gcc bug https://bugzilla.redhat.com/show_bug.cgi?id=2241339
# for details.
-%if 0%{?gts_version} == 0
+# %if 0%{?gts_version} == 0
BuildRequires: gcc-c++ >= 13.3
-%else
-BuildRequires: gcc-toolset-%{gts_version}-gcc-c++ >= 13.3
-BuildRequires: gcc-toolset-%{gts_version}-runtime
-BuildRequires: gcc-toolset-%{gts_version}-libatomic-devel
-%endif
+# %else
+# BuildRequires: gcc-toolset-%{gts_version}-gcc-c++ >= 13.3
+# BuildRequires: gcc-toolset-%{gts_version}-runtime
+# BuildRequires: gcc-toolset-%{gts_version}-libatomic-devel
+# %endif
%if 0%{?fedora} || 0%{?rhel} == 9 || 0%{?openEuler}
BuildRequires: libatomic
%endif
@@ -1438,7 +1438,7 @@ cmake .. \
-DCMAKE_C_COMPILER=gcc-11 \
-DCMAKE_CXX_COMPILER=g++-11 \
%endif
-%if 0%{?gts_version} == 13
+%if 0%{?gts_version} >= 13
-DCMAKE_EXE_LINKER_FLAGS=-lstdc++ \
%endif
-DCMAKE_INSTALL_PREFIX=%{_prefix} \
diff --git a/install-deps.sh b/install-deps.sh
index 65ce59da2e0..c1aecf5fcad 100755
--- a/install-deps.sh
+++ b/install-deps.sh
@@ -38,6 +38,7 @@ function munge_ceph_spec_in {
shift
local OUTFILE=$1
sed -e 's/@//g' < ceph.spec.in > $OUTFILE
+ cp $OUTFILE /tmp/uuuu
# http://rpm.org/user_doc/conditional_builds.html
if ! $with_crimson; then
sed -i -e 's/%bcond_without crimson/%bcond_with crimson/g' $OUTFILE
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment