diff --git a/audacity.changes b/audacity.changes index 2826c5d..0d681e4 100644 --- a/audacity.changes +++ b/audacity.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jun 6 17:34:10 UTC 2017 - olaf@aepfle.de + +- Adjust usage of gccN-c++ for Leap42 and SLE12 + ------------------------------------------------------------------- Wed Mar 22 15:29:45 UTC 2017 - davejplater@gmail.com diff --git a/audacity.spec b/audacity.spec index 34aab70..56efe2e 100644 --- a/audacity.spec +++ b/audacity.spec @@ -44,12 +44,17 @@ BuildRequires: cmake BuildRequires: desktop-file-utils #Audacity only builds with gcc >= 4.9 # WARNING: Anything built against wxWidgets with gcc >= 5 needs widgets built with relax-abi.diff -%if 0%{?suse_version} < 1330 -BuildRequires: cpp5 -BuildRequires: gcc5 +%if 0%{?suse_version} > 1320 +BuildRequires: gcc-c++ +%else +# Bomi requires C++14 support. +%if 0%{?sle_version} == 120100 +# Leap 42.1 BuildRequires: gcc5-c++ %else -BuildRequires: gcc-c++ +# Leap 42.2+ / SLE12SP2Backports +BuildRequires: gcc6-c++ +%endif %endif BuildRequires: hicolor-icon-theme BuildRequires: wxWidgets-3_0-nostl-devel @@ -119,11 +124,12 @@ rm -rf lib-src/lame/ %endif %build -%if 0%{?suse_version} < 1330 -export CC=gcc-5 -export CPP=cpp-5 -export CXX=g++-5 -%endif +test -x "$(type -p gcc-5)" && export CC=gcc-5 +test -x "$(type -p g++-5)" && export CXX=g++-5 +test -x "$(type -p gcc-6)" && export CC=gcc-6 +test -x "$(type -p g++-6)" && export CXX=g++-6 +test -x "$(type -p gcc-7)" && export CC=gcc-7 +test -x "$(type -p g++-7)" && export CXX=g++-7 export CFLAGS="%{optflags} -fno-strict-aliasing" export CXXFLAGS="$CFLAGS -std=gnu++11" aclocal -I m4