diff options
| author | he <he@pkgsrc.org> | 2017-08-22 21:37:27 +0000 |
|---|---|---|
| committer | he <he@pkgsrc.org> | 2017-08-22 21:37:27 +0000 |
| commit | 9614aa4cd6da084f0ac21ba526a95a32d442ecb2 (patch) | |
| tree | d0b02a59bee673d096c03dd3a4ac630436cad47d /math/py-scipy | |
| parent | 619a6d58f9d0c9f48124b98a29327267630235a1 (diff) | |
| download | pkgsrc-9614aa4cd6da084f0ac21ba526a95a32d442ecb2.tar.gz | |
Add a patch which fixes an obviously bogus preprocessor conditional;
in our case, __STDC_VERSION__ isn't defined when built as C++.
The fix isn't completeely right, it insists on <fenv.h> if built as C++.
Not entirely unreasonable, and makes this build on NetBSD/powerpc as well,
which doesn't like the redefinition of fegetround() and fesetround().
Bump PKGREVISION.
Diffstat (limited to 'math/py-scipy')
| -rw-r--r-- | math/py-scipy/Makefile | 3 | ||||
| -rw-r--r-- | math/py-scipy/distinfo | 3 | ||||
| -rw-r--r-- | math/py-scipy/patches/patch-scipy_special___round.h | 17 |
3 files changed, 21 insertions, 2 deletions
diff --git a/math/py-scipy/Makefile b/math/py-scipy/Makefile index c7d50e1ad8f..19b04b7a0ca 100644 --- a/math/py-scipy/Makefile +++ b/math/py-scipy/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.25 2017/06/24 08:19:40 adam Exp $ +# $NetBSD: Makefile,v 1.26 2017/08/22 21:37:27 he Exp $ DISTNAME= scipy-0.19.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} +PKGREVISION= 1 CATEGORIES= math python MASTER_SITES= ${MASTER_SITE_PYPI:=s/scipy/} diff --git a/math/py-scipy/distinfo b/math/py-scipy/distinfo index 842cdffe974..d771bee6fd1 100644 --- a/math/py-scipy/distinfo +++ b/math/py-scipy/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.12 2017/06/24 08:19:40 adam Exp $ +$NetBSD: distinfo,v 1.13 2017/08/22 21:37:27 he Exp $ SHA1 (scipy-0.19.1.tar.gz) = b6397bcd7c62e46a6dc12f3d0df07c184912108a RMD160 (scipy-0.19.1.tar.gz) = d1314b26ee569df47d99fa98b86ac3aa7dc2d433 SHA512 (scipy-0.19.1.tar.gz) = 5c124c44c672dcb53c31f8592fd9f74189f04cb0bade99476a2a6eb4844338e3e9842f27a148b007b7eed25cbfde090a697575a381ebe4ca066abdf54c214203 Size (scipy-0.19.1.tar.gz) = 14083805 bytes +SHA1 (patch-scipy_special___round.h) = 30799ea2c824dc9cc0b399e7450ec10ec7137d2b diff --git a/math/py-scipy/patches/patch-scipy_special___round.h b/math/py-scipy/patches/patch-scipy_special___round.h new file mode 100644 index 00000000000..45371a5dd91 --- /dev/null +++ b/math/py-scipy/patches/patch-scipy_special___round.h @@ -0,0 +1,17 @@ +$NetBSD: patch-scipy_special___round.h,v 1.1 2017/08/22 21:37:27 he Exp $ + +This conditional is just wrong, when built with c++, __STDC_VERSION__ +is not defined. Make a cheezy fix which insists on <fenv.h> when +built with C++. + +--- scipy/special/_round.h.orig 2017-01-09 07:17:38.000000000 +0000 ++++ scipy/special/_round.h +@@ -49,7 +49,7 @@ double add_round_down(double a, double b + + + /* Helper code for testing _round.h. */ +-#if __STDC_VERSION__ >= 199901L ++#if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || defined(__cplusplus) + /* We have C99 */ + #include <fenv.h> + #else |