diff options
| author | rillig <rillig@pkgsrc.org> | 2007-08-30 09:15:52 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2007-08-30 09:15:52 +0000 |
| commit | febdd0b8b5c89f6daf0f64b80415e5afd1d476a1 (patch) | |
| tree | 590c8972f31247848f45ca7685d72ad6664b59d3 /audio/festival | |
| parent | ccda6223e2288dff7ea226150e9a8a7686795551 (diff) | |
| download | pkgsrc-febdd0b8b5c89f6daf0f64b80415e5afd1d476a1.tar.gz | |
Fixed building with g++-3.3.6 on NetBSD.
Diffstat (limited to 'audio/festival')
| -rw-r--r-- | audio/festival/distinfo | 4 | ||||
| -rw-r--r-- | audio/festival/patches/patch-ae | 21 |
2 files changed, 19 insertions, 6 deletions
diff --git a/audio/festival/distinfo b/audio/festival/distinfo index 1d3191225c4..098c0eddbea 100644 --- a/audio/festival/distinfo +++ b/audio/festival/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.13 2005/12/03 04:14:05 joerg Exp $ +$NetBSD: distinfo,v 1.14 2007/08/30 09:15:52 rillig Exp $ SHA1 (festival-1.95-beta.tar.gz) = 7bbf841b07a09cfe1ab17db23c2ebc12ea3d854b RMD160 (festival-1.95-beta.tar.gz) = 7f7cce6ab170ab1e83911ed92408576fff32cbd6 @@ -10,4 +10,4 @@ SHA1 (patch-aa) = 016faac0fbd2291f349b3710aefdc4df736af0d8 SHA1 (patch-ab) = 23e55253b22df5b8d2bc44b08f6757c90c1f13a8 SHA1 (patch-ac) = c0a3fbd4e98ef941ef78c1ae800ef33a5153e8f9 SHA1 (patch-ad) = b035df9c711d0f7ee1a31b663bc44c94bd904304 -SHA1 (patch-ae) = b957601a9038dc614fdec2a720da4b30909cab1b +SHA1 (patch-ae) = 2a0449f50e9a339767c02cc92045dd5467927ed3 diff --git a/audio/festival/patches/patch-ae b/audio/festival/patches/patch-ae index 50b24a9b557..e3d53391129 100644 --- a/audio/festival/patches/patch-ae +++ b/audio/festival/patches/patch-ae @@ -1,8 +1,16 @@ -$NetBSD: patch-ae,v 1.4 2005/12/03 04:14:05 joerg Exp $ +$NetBSD: patch-ae,v 1.5 2007/08/30 09:15:53 rillig Exp $ ---- speech_tools/include/EST_math.h.orig 2005-12-03 03:17:51.000000000 +0000 -+++ speech_tools/include/EST_math.h -@@ -94,6 +94,11 @@ extern "C" { +--- speech_tools/include/EST_math.h.orig 2004-04-30 18:56:49.000000000 +0200 ++++ speech_tools/include/EST_math.h 2007-08-30 10:51:43.000000000 +0200 +@@ -46,6 +46,7 @@ + extern "C" int isnan(double); + #endif + ++#include <cmath> + #include <math.h> + #include <limits.h> + #include <float.h> +@@ -94,6 +95,16 @@ extern "C" { #define isnanf(X) isnan(X) #endif @@ -11,6 +19,11 @@ $NetBSD: patch-ae,v 1.4 2005/12/03 04:14:05 joerg Exp $ +#define isnanf(X) isnan(X) +#endif + ++/* The g++-3.3.6 <cmath> header undefines the macro isnan, but shouldn't. */ ++#if !defined(isnan) && defined(__fpmacro_unary_floating) ++#define isnan(X) __fpmacro_unary_floating(isnan, (X)) ++#endif ++ /* FreeBSD *and other 4.4 based systems require anything, isnanf is defined */ #if defined(__FreeBSD__) |