3
0
Fork 0
forked from mirrors/nixpkgs

jack2: apply patch to fix build with gcc5

This commit is contained in:
Cillian de Róiste 2015-09-03 14:22:13 +02:00 committed by William A. Kennington III
parent 1e83055cd2
commit 55d822c512
2 changed files with 29 additions and 1 deletions

View file

@ -41,10 +41,12 @@ stdenv.mkDerivation rec {
optDbus optPythonDBus optLibffado optAlsaLib optLibopus
];
patchPhase = ''
prePatch = ''
substituteInPlace svnversion_regenerate.sh --replace /bin/bash ${bash}/bin/bash
'';
patches = [ ./jack-gcc5.patch ];
configurePhase = ''
python waf configure --prefix=$out \
${optionalString (optDbus != null) "--dbus"} \

View file

@ -0,0 +1,26 @@
From d3c8e2d8d78899fba40a3e677ed4dbe388d82269 Mon Sep 17 00:00:00 2001
From: Adrian Knoth <adi@drcomp.erfurt.thur.de>
Date: Thu, 18 Sep 2014 18:29:23 +0200
Subject: [PATCH] Fix FTBFS with clang++
Forwarded from http://bugs.debian.org/757820
---
common/memops.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/common/memops.c b/common/memops.c
index 27f6194..2d416b6 100644
--- a/common/memops.c
+++ b/common/memops.c
@@ -198,7 +198,7 @@ static inline __m128i float_24_sse(__m128 s)
*/
static unsigned int seed = 22222;
-inline unsigned int fast_rand() {
+static inline unsigned int fast_rand() {
seed = (seed * 96314165) + 907633515;
return seed;
}
--
2.4.0