diff options
author | joerg <joerg@pkgsrc.org> | 2005-12-08 14:35:01 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2005-12-08 14:35:01 +0000 |
commit | 6f0725eb5f168213dae570655fdac8cc70e92db2 (patch) | |
tree | 2be08bb2cd6dbed60ee54c025c6b105cb688a6ba | |
parent | 79517496734130b3395a05b1bb9258c3307ffcf4 (diff) | |
download | pkgsrc-6f0725eb5f168213dae570655fdac8cc70e92db2.tar.gz |
Add a somewhat tricky check to get isinf correctly on DragonFly.
This is tricky, because isinf as macro is removed by cmath, but
only if libstdc++ on GCC is compiled for C99 math support. Try to
check for this and use the symbol from namespace std.
-rw-r--r-- | math/octave-current/distinfo | 3 | ||||
-rw-r--r-- | math/octave-current/patches/patch-ab | 23 |
2 files changed, 25 insertions, 1 deletions
diff --git a/math/octave-current/distinfo b/math/octave-current/distinfo index 31fe1b6dd7e..c7d03e18457 100644 --- a/math/octave-current/distinfo +++ b/math/octave-current/distinfo @@ -1,9 +1,10 @@ -$NetBSD: distinfo,v 1.32 2005/07/01 16:11:05 adam Exp $ +$NetBSD: distinfo,v 1.33 2005/12/08 14:35:01 joerg Exp $ SHA1 (octave-2.9.3.tar.bz2) = be8a478650943250f0ef65521ddac025c29f0d75 RMD160 (octave-2.9.3.tar.bz2) = 6b0c922efaa534485f1607f1979c90839394b21d Size (octave-2.9.3.tar.bz2) = 6213159 bytes SHA1 (patch-aa) = 34994a9e366675dfaf8aca3ced4fc662504e81c8 +SHA1 (patch-ab) = 0fd7f053c1d788740868f0baef61324ae715215a SHA1 (patch-ac) = 16ec66a68e5ed80064d811cd1c8dda226a2f5ede SHA1 (patch-ad) = 01d0fb5878897a91d33e2cb7cbc6d2575a04c464 SHA1 (patch-ae) = 79544d09268d41647b081680fc839f4fe481b111 diff --git a/math/octave-current/patches/patch-ab b/math/octave-current/patches/patch-ab new file mode 100644 index 00000000000..82619376c98 --- /dev/null +++ b/math/octave-current/patches/patch-ab @@ -0,0 +1,23 @@ +$NetBSD: patch-ab,v 1.5 2005/12/08 14:35:01 joerg Exp $ + +--- src/DLD-FUNCTIONS/__glpk__.cc.orig 2005-05-18 12:21:01.000000000 +0000 ++++ src/DLD-FUNCTIONS/__glpk__.cc +@@ -26,6 +26,7 @@ Software Foundation, Inc., 51 Franklin S + #endif + + #include <cfloat> ++#include <cmath> + #include <csetjmp> + #include <ctime> + +@@ -36,6 +37,10 @@ Software Foundation, Inc., 51 Franklin S + #include "oct-obj.h" + #include "pager.h" + ++#if defined(_GLIBCXX_USE_C99_MATH) && !defined(_GLIBCXX_USE_C99_FP_MACROS_DYNAMIC) ++using std::isinf; ++#endif ++ + #if defined (HAVE_GLPK) + + extern "C" { |