rpm/audacity
SHA256
1
0
Fork 0
forked from pool/audacity
Code Pull Requests Activity

- Adjust usage of gccN-c++ for Leap42 and SLE12

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/audacity?expand=0&rev=101
This commit is contained in:
Olaf Hering 2017-06-27 21:19:42 +00:00 committed by Git OBS Bridge
parent 1da40a592b
commit c9a6f7d618
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
audacity.changes
View File

@ -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 Wed Mar 22 15:29:45 UTC 2017 - davejplater@gmail.com

24
audacity.spec
View File

@ -44,12 +44,17 @@ BuildRequires: cmake
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
#Audacity only builds with gcc >= 4.9 #Audacity only builds with gcc >= 4.9
# WARNING: Anything built against wxWidgets with gcc >= 5 needs widgets built with relax-abi.diff # WARNING: Anything built against wxWidgets with gcc >= 5 needs widgets built with relax-abi.diff
%if 0%{?suse_version} < 1330 %if 0%{?suse_version} > 1320
BuildRequires: cpp5 BuildRequires: gcc-c++
BuildRequires: gcc5 %else
# Bomi requires C++14 support.
%if 0%{?sle_version} == 120100
# Leap 42.1
BuildRequires: gcc5-c++ BuildRequires: gcc5-c++
%else %else
BuildRequires: gcc-c++ # Leap 42.2+ / SLE12SP2Backports
BuildRequires: gcc6-c++
%endif
%endif %endif
BuildRequires: hicolor-icon-theme BuildRequires: hicolor-icon-theme
BuildRequires: wxWidgets-3_0-nostl-devel BuildRequires: wxWidgets-3_0-nostl-devel
@ -119,11 +124,12 @@ rm -rf lib-src/lame/
%endif %endif
%build %build
%if 0%{?suse_version} < 1330 test -x "$(type -p gcc-5)" && export CC=gcc-5
export CC=gcc-5 test -x "$(type -p g++-5)" && export CXX=g++-5
export CPP=cpp-5 test -x "$(type -p gcc-6)" && export CC=gcc-6
export CXX=g++-5 test -x "$(type -p g++-6)" && export CXX=g++-6
%endif 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 CFLAGS="%{optflags} -fno-strict-aliasing"
export CXXFLAGS="$CFLAGS -std=gnu++11" export CXXFLAGS="$CFLAGS -std=gnu++11"
aclocal -I m4 aclocal -I m4