CVS commit: [pkgsrc-2017Q2] pkgsrc/math/py-scipy

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Mon Aug 28 19:03:29 UTC 2017

Modified Files:
        pkgsrc/math/py-scipy [pkgsrc-2017Q2]: Makefile distinfo
Added Files:
        pkgsrc/math/py-scipy/patches [pkgsrc-2017Q2]:
            patch-scipy_special___round.h

Log Message:
Pullup ticket #5535 - requested by he
math/py-scipy: powerpc build fix

Revisions pulled up:
- math/py-scipy/Makefile                                        1.26
- math/py-scipy/distinfo                                        1.13
- math/py-scipy/patches/patch-scipy_special___round.h           1.1

---
   Module Name: pkgsrc
   Committed By:        he
   Date:                Tue Aug 22 21:37:28 UTC 2017

   Modified Files:
        pkgsrc/math/py-scipy: Makefile distinfo
   Added Files:
        pkgsrc/math/py-scipy/patches: patch-scipy_special___round.h

   Log Message:
   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.


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.25.2.1 pkgsrc/math/py-scipy/Makefile
cvs rdiff -u -r1.12 -r1.12.2.1 pkgsrc/math/py-scipy/distinfo
cvs rdiff -u -r0 -r1.1.2.2 \
    pkgsrc/math/py-scipy/patches/patch-scipy_special___round.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/math/py-scipy/Makefile
diff -u pkgsrc/math/py-scipy/Makefile:1.25 pkgsrc/math/py-scipy/Makefile:1.25.2.1
--- pkgsrc/math/py-scipy/Makefile:1.25  Sat Jun 24 08:19:40 2017
+++ pkgsrc/math/py-scipy/Makefile       Mon Aug 28 19:03:29 2017
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2017/06/24 08:19:40 adam Exp $
+# $NetBSD: Makefile,v 1.25.2.1 2017/08/28 19:03:29 bsiegert Exp $
 
 DISTNAME=      scipy-0.19.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
+PKGREVISION=   1
 CATEGORIES=    math python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=s/scipy/}
 

Index: pkgsrc/math/py-scipy/distinfo
diff -u pkgsrc/math/py-scipy/distinfo:1.12 pkgsrc/math/py-scipy/distinfo:1.12.2.1
--- pkgsrc/math/py-scipy/distinfo:1.12  Sat Jun 24 08:19:40 2017
+++ pkgsrc/math/py-scipy/distinfo       Mon Aug 28 19:03:29 2017
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.12 2017/06/24 08:19:40 adam Exp $
+$NetBSD: distinfo,v 1.12.2.1 2017/08/28 19:03:29 bsiegert 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

Added files:

Index: pkgsrc/math/py-scipy/patches/patch-scipy_special___round.h
diff -u /dev/null pkgsrc/math/py-scipy/patches/patch-scipy_special___round.h:1.1.2.2
--- /dev/null   Mon Aug 28 19:03:29 2017
+++ pkgsrc/math/py-scipy/patches/patch-scipy_special___round.h  Mon Aug 28 19:03:29 2017
@@ -0,0 +1,17 @@
+$NetBSD: patch-scipy_special___round.h,v 1.1.2.2 2017/08/28 19:03:29 bsiegert 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