diff --git a/buzztrax.changes b/buzztrax.changes index 67a011b..9e8d404 100644 --- a/buzztrax.changes +++ b/buzztrax.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Apr 4 20:58:43 UTC 2019 - olaf@aepfle.de + +- Use gcc8 in SLE_12 + ------------------------------------------------------------------- Fri Jan 18 10:57:59 UTC 2019 - davejplater@gmail.com diff --git a/buzztrax.spec b/buzztrax.spec index 4bb345c..2ab3e32 100644 --- a/buzztrax.spec +++ b/buzztrax.spec @@ -48,7 +48,11 @@ Patch4: buzztrax-newfix.patch BuildRequires: automake >= 1.13 BuildRequires: desktop-file-utils BuildRequires: fdupes +%if 0%{?suse_version} > 1320 BuildRequires: gcc-c++ +%else +BuildRequires: gcc8-c++ +%endif BuildRequires: gtk-doc BuildRequires: hicolor-icon-theme BuildRequires: intltool @@ -211,12 +215,8 @@ cp -v %{SOURCE2} . cp -v %{SOURCE1} . %build -%if 1 == 0 -%define gcc_version 8 -export CC=gcc-8 -export CPP=cpp-8 -export CXX=g++-8 -%endif +test -x "$(type -p gcc-8)" && export CC="$_" +test -x "$(type -p g++-8)" && export CXX="$_" export CFLAGS="%{optflags} -Wno-error=deprecated-declarations" export CFLAGS="$CFLAGS -Wno-error=format-truncation= -Wno-error=format-overflow= -Wno-error=incompatible-pointer-types -Wno-error=restrict" export CXXFLAGS="$CFLAGS"