summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Graham Northup <grissess@nexusg.org> 2017-06-08 16:14:04 -0400
committerAvatar Heiko Becker <heirecka@exherbo.org> 2017-08-27 10:28:03 +0200
commit911078d548978cb8a9e7f69025a1bf2c309ced04 (patch)
tree37ba14aa3cf0a842e3a9d92335cf97fa2bb1ef7c
parentab8eacabeda317bae0673e23191e47b93645e4b7 (diff)
downloadmedia-911078d548978cb8a9e7f69025a1bf2c309ced04.tar.gz
media-911078d548978cb8a9e7f69025a1bf2c309ced04.tar.xz
Force C++11 for non-sequencer in GCC 5
non-sequencer seems to assume that GCC always uses C++11, which is only true starting around version 6 (from some empirical testing). This is an interim fix; I've [notified upstream][issue] already, but with no response yet. [issue]: https://github.com/original-male/non/issues/210 Change-Id: Iad9e10677728bb1496a812f94db34efb3e40dcb7 Reviewed-on: https://galileo.mailstation.de/gerrit/9253 Reviewed-by: Rasmus Thomsen <Rasmus.thomsen@protonmail.com> Retest: Rasmus Thomsen <Rasmus.thomsen@protonmail.com> Reviewed-by: Heiko Becker <heirecka@exherbo.org>
-rw-r--r--packages/media-sound/non-sequencer/non-sequencer-scm-r1.exheres-012
1 files changed, 12 insertions, 0 deletions
diff --git a/packages/media-sound/non-sequencer/non-sequencer-scm-r1.exheres-0 b/packages/media-sound/non-sequencer/non-sequencer-scm-r1.exheres-0
index 6787a5c..f766749 100644
--- a/packages/media-sound/non-sequencer/non-sequencer-scm-r1.exheres-0
+++ b/packages/media-sound/non-sequencer/non-sequencer-scm-r1.exheres-0
@@ -1,8 +1,10 @@
# Copyright 2010 Adriaan Leijnse <adriaan@leijnse.net>
# Copyright 2012, 2014 Ali Polatel <alip@exherbo.org>
+# Copyright 2017 Graham Northup <grissess@nexusg.org>
# Distributed under the terms of the GNU General Public License v2
require non
+require toolchain-funcs
SUMMARY="Powerful real-time, pattern-based MIDI sequencer"
DESCRIPTION="
@@ -23,3 +25,13 @@ DEPENDENCIES="
BUGS_TO="alip@exherbo.org"
+src_configure() {
+ # Temporarily fixes an upstream bug where the sources assume GCC always
+ # does C++11
+ if cc-is-gcc && [[ "$(gcc-major-version)" < 6 ]]; then
+ # FIXME: flag-o-matic doesn't yet support `-std=xxx` in CXXFLAGS
+ export CXXFLAGS="${CXXFLAGS} -std=c++11"
+ fi
+
+ waf_src_configure
+}