diff options
| author |   Peter Levine <plevine457@gmail.com> | 2017-05-25 01:22:48 -0400 |
|---|---|---|
| committer |   Alexis Ballier <aballier@gentoo.org> | 2017-05-25 18:10:01 +0200 |
| commit | a3b4b54a208b3b18e6e2915cb354e209c63cffe6 (patch) | |
| tree | f8142db7af093ffe105db5a5f1a4026d2d5b32b8 /media-sound | |
| parent | dev-libs/c-capnproto: remove old (diff) | |
| download | gentoo-a3b4b54a208b3b18e6e2915cb354e209c63cffe6.tar.gz gentoo-a3b4b54a208b3b18e6e2915cb354e209c63cffe6.tar.bz2 gentoo-a3b4b54a208b3b18e6e2915cb354e209c63cffe6.zip | |
media-sound/helm: Fix building with GCC-6
Bug: https://bugs.gentoo.org/show_bug.cgi?id=594480
Package-Manager: Portage-2.3.6, Repoman-2.3.2
Diffstat (limited to 'media-sound')
| -rw-r--r-- | media-sound/helm/files/helm-0.4.1-gcc6.patch | 24 | ||||
| -rw-r--r-- | media-sound/helm/helm-0.4.1-r1.ebuild | 3 |
2 files changed, 26 insertions, 1 deletions
diff --git a/media-sound/helm/files/helm-0.4.1-gcc6.patch b/media-sound/helm/files/helm-0.4.1-gcc6.patch new file mode 100644 index 000000000000..efb54f0b5c58 --- /dev/null +++ b/media-sound/helm/files/helm-0.4.1-gcc6.patch @@ -0,0 +1,24 @@ +From 9a94165d8c400e45d617bf2d7cb657a477f43915 Mon Sep 17 00:00:00 2001 +From: Hodorgasm <nsane457@gmail.com> +Date: Tue, 20 Sep 2016 17:33:14 -0400 +Subject: [PATCH] Assume there exists lround if compiling with g++ in C++11 or + later + +GCC-6 doesn't define HAVE_LROUND, but lround is valid in C++ in dialects >= c++11. +--- + JUCE/modules/juce_audio_formats/codecs/flac/libFLAC/lpc_flac.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/JUCE/modules/juce_audio_formats/codecs/flac/libFLAC/lpc_flac.c b/JUCE/modules/juce_audio_formats/codecs/flac/libFLAC/lpc_flac.c +index 87e2321e6..512b8279c 100644 +--- a/JUCE/modules/juce_audio_formats/codecs/flac/libFLAC/lpc_flac.c ++++ b/JUCE/modules/juce_audio_formats/codecs/flac/libFLAC/lpc_flac.c +@@ -50,7 +50,7 @@ +
+ #ifndef FLAC__INTEGER_ONLY_LIBRARY
+
+-#if !defined(HAVE_LROUND)
++#if (!defined(__GNUC__) && !defined(HAVE_LROUND)) || __cplusplus < 201103L
+ #if defined(_MSC_VER)
+ #include <float.h>
+ #define copysign _copysign
diff --git a/media-sound/helm/helm-0.4.1-r1.ebuild b/media-sound/helm/helm-0.4.1-r1.ebuild index 9ac626e661cd..e4687ef57be5 100644 --- a/media-sound/helm/helm-0.4.1-r1.ebuild +++ b/media-sound/helm/helm-0.4.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -24,6 +24,7 @@ DEPEND="${RDEPEND}" DOCS="README.md" src_prepare() { + epatch "${FILESDIR}"/${P}-gcc6.patch rm patches/Synth/.DS_Store || die sed -e 's|/usr/lib/|/usr/'$(get_libdir)'/|' -i Makefile || die epatch_user |