From 80949babab4aac86647ce9973f6b44adb92fae95 Mon Sep 17 00:00:00 2001 From: Tim Serong Date: Wed, 3 Aug 2022 15:20:23 +1000 Subject: [PATCH] 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 --- ceph.spec.in | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/ceph.spec.in b/ceph.spec.in index 7a0a6009e8930..136b033b267ea 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -204,16 +204,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 @@ -1311,10 +1308,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} \ -- 2.39.5