Accepting request 569822 from home:plater

Build with gcc7 for Leap:42.3 and 
-fstack-clash-protection

OBS-URL: https://build.opensuse.org/request/show/569822
OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/audacity?expand=0&rev=117
This commit is contained in:
Dave Plater 2018-01-26 09:27:51 +00:00 committed by Git OBS Bridge
parent eadc85e4a1
commit 6eb45bb0d0
2 changed files with 13 additions and 6 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Jan 26 09:23:34 UTC 2018 - davejplater@gmail.com
- Build with gcc7 for Leap:42.3 and -fstack-clash-protection
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jan 15 19:06:10 UTC 2018 - jengelh@inai.de Mon Jan 15 19:06:10 UTC 2018 - jengelh@inai.de

View File

@ -46,11 +46,11 @@ BuildRequires: automake
BuildRequires: cmake 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 and gcc >= 5
%if 0%{?suse_version} < 1330 %if 0%{?suse_version} < 1330
BuildRequires: cpp5 BuildRequires: cpp7
BuildRequires: gcc5 BuildRequires: gcc7
BuildRequires: gcc5-c++ BuildRequires: gcc7-c++
%else %else
BuildRequires: gcc-c++ BuildRequires: gcc-c++
%endif %endif
@ -118,8 +118,10 @@ rm -rf lib-src/lame
%build %build
# WARNING: Do not alter, only for Leap. # WARNING: Do not alter, only for Leap.
test -x "$(type -p gcc-5)" && export CC=gcc-5 test -x "$(type -p %{_bindir}/gcc-7)" && export CC="%{_bindir}/gcc-7"
test -x "$(type -p g++-5)" && export CXX=g++-5 test -x "$(type -p %{_bindir}/g++-7)" && export CXX="%{_bindir}/g++-7"
test -x "$(type -p %{_bindir}/cpp-7)" && export CPP="%{_bindir}/cpp-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