From 44869c626c2cd53939d9fc1a6b08e1886d1d9ca0 Mon Sep 17 00:00:00 2001 From: Philipp Storz Date: Thu, 7 Oct 2021 16:49:33 +0200 Subject: [PATCH] bareos.spec: use gcc10 on sle153 and later --- core/platforms/packaging/bareos.spec | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/core/platforms/packaging/bareos.spec b/core/platforms/packaging/bareos.spec index d4b5d6204cc..ef39721e64b 100644 --- a/core/platforms/packaging/bareos.spec +++ b/core/platforms/packaging/bareos.spec @@ -142,9 +142,14 @@ BuildRequires: devtoolset-8-gcc BuildRequires: devtoolset-8-gcc-c++ %endif -%if 0%{?suse_version} +%if 0%{?sle_version} >= 150300 +BuildRequires: gcc10 +BuildRequires: gcc10-c++ +%else + %if 0%{?suse_version} BuildRequires: gcc9 BuildRequires: gcc9-c++ + %endif %endif %if 0%{?systemd_support} @@ -958,12 +963,19 @@ pushd %{CMAKE_BUILDDIR} source /opt/rh/devtoolset-8/enable %endif -# use gcc9 on SuSE -%if 0%{?suse_version} +# use modern compiler on suse +%if 0%{?sle_version} >= 150300 +CC=gcc-10 ; export CC +CXX=g++-10 ; export CXX +%else + %if 0%{?suse_version} CC=gcc-9 ; export CC CXX=g++-9 ; export CXX + %endif %endif + + CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ;