From: Tim Serong <tserong@suse.com>
Date: Wed, 3 Aug 2022 05:20:23 +0000 (+1000)
Subject: ceph.spec.in: set BuildRequires: gcc-c++ >= 11 for SUSE distros
X-Git-Tag: v17.2.4~113^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=61178502ce3684ae3e153435f7caa68d3f12a6a0;p=ceph.git

ceph.spec.in: set BuildRequires: gcc-c++ >= 11 for SUSE distros

This is much simpler than explicitly requiring gcc 11, and
anyway, openSUSE Tumbleweed is up to gcc 12 now.

Signed-off-by: Tim Serong <tserong@suse.com>
(cherry picked from commit 80949babab4aac86647ce9973f6b44adb92fae95)
---

diff --git a/ceph.spec.in b/ceph.spec.in
index 51933d2a3ee8..6312605f43cb 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -203,16 +203,13 @@ BuildRequires:	selinux-policy-devel
 BuildRequires:	gperf
 BuildRequires:  cmake > 3.5
 BuildRequires:	fuse-devel
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?suse_version}
 BuildRequires:	gcc-c++ >= 11
 %endif
 %if 0%{?rhel} >= 8
 BuildRequires:	gcc-toolset-11-gcc-c++
 BuildRequires:	gcc-toolset-11-build
 %endif
-%if 0%{?suse_version}
-BuildRequires:	gcc11-c++
-%endif
 %if 0%{with tcmalloc}
 # libprofiler did not build on ppc64le until 2.7.90
 %if 0%{?fedora} || 0%{?rhel} >= 8
@@ -1295,10 +1292,6 @@ env | sort
 mkdir -p %{_vpath_builddir}
 pushd %{_vpath_builddir}
 cmake .. \
-%if 0%{?suse_version}
-    -DCMAKE_C_COMPILER=gcc-11 \
-    -DCMAKE_CXX_COMPILER=g++-11 \
-%endif
     -DCMAKE_INSTALL_PREFIX=%{_prefix} \
     -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \
     -DCMAKE_INSTALL_LIBEXECDIR:PATH=%{_libexecdir} \