From 6eb45bb0d002fd3c4adc3f6adbb1f184b9bb064391264bb901c2df48d72874a8 Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Fri, 26 Jan 2018 09:27:51 +0000 Subject: [PATCH] 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 --- audacity.changes | 5 +++++ audacity.spec | 14 ++++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/audacity.changes b/audacity.changes index a9e02b3..bd33aa0 100644 --- a/audacity.changes +++ b/audacity.changes @@ -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 diff --git a/audacity.spec b/audacity.spec index 5a40c02..71e9f4d 100644 --- a/audacity.spec +++ b/audacity.spec @@ -46,11 +46,11 @@ BuildRequires: automake 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 +# WARNING: Anything built against wxWidgets with gcc >= 5 needs widgets built with relax-abi.diff and gcc >= 5 %if 0%{?suse_version} < 1330 -BuildRequires: cpp5 -BuildRequires: gcc5 -BuildRequires: gcc5-c++ +BuildRequires: cpp7 +BuildRequires: gcc7 +BuildRequires: gcc7-c++ %else BuildRequires: gcc-c++ %endif @@ -118,8 +118,10 @@ rm -rf lib-src/lame %build # WARNING: Do not alter, only for Leap. -test -x "$(type -p gcc-5)" && export CC=gcc-5 -test -x "$(type -p g++-5)" && export CXX=g++-5 +test -x "$(type -p %{_bindir}/gcc-7)" && export CC="%{_bindir}/gcc-7" +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 CXXFLAGS="$CFLAGS -std=gnu++11" aclocal -I m4