pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/math/py-scipy math/py-scipy: fix build on NetBSD/power...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/0aa503365ed9
branches:  trunk
changeset: 382533:0aa503365ed9
user:      he <he%pkgsrc.org@localhost>
date:      Sat Jul 30 16:13:47 2022 +0000

description:
math/py-scipy: fix build on NetBSD/powerpc (at least!)

In the unuran part, omit defining _ISOC99_SOURCE.  I am told that
the ieeefp.h header should not be used with _ISOC99_SOURCE.  (Its
use comes from pyport.h.)  Lately I've seen this package fail to
build also for aarch64, have not verified that this fixes it, though
it's not entirely impossible.

Fixes what triggered PR#56892.

Bump PKGREVISION.

diffstat:

 math/py-scipy/Makefile                                   |   4 ++--
 math/py-scipy/distinfo                                   |   3 ++-
 math/py-scipy/patches/patch-scipy_stats__unuran_setup.py |  16 ++++++++++++++++
 3 files changed, 20 insertions(+), 3 deletions(-)

diffs (47 lines):

diff -r 42cbc1bb5ecd -r 0aa503365ed9 math/py-scipy/Makefile
--- a/math/py-scipy/Makefile    Sat Jul 30 15:11:26 2022 +0000
+++ b/math/py-scipy/Makefile    Sat Jul 30 16:13:47 2022 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.59 2022/06/28 11:34:45 wiz Exp $
+# $NetBSD: Makefile,v 1.60 2022/07/30 16:13:47 he Exp $
 
 DISTNAME=      scipy-1.8.1
-PKGREVISION=   2
+PKGREVISION=   3
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=    math python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=s/scipy/}
diff -r 42cbc1bb5ecd -r 0aa503365ed9 math/py-scipy/distinfo
--- a/math/py-scipy/distinfo    Sat Jul 30 15:11:26 2022 +0000
+++ b/math/py-scipy/distinfo    Sat Jul 30 16:13:47 2022 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.36 2022/05/27 16:59:50 tnn Exp $
+$NetBSD: distinfo,v 1.37 2022/07/30 16:13:47 he Exp $
 
 BLAKE2s (scipy-1.8.1.tar.gz) = 364d6645a49d897429094a406e6073e124c1ebca01f4be63ebe401b660d8df38
 SHA512 (scipy-1.8.1.tar.gz) = f6fc71c209991fe82baa4b10d8ade0deb1057f6f5942a91dfb7ae45f3eb78a4535efa2861badf5e2d37239fa99dbd99de760aa7e4854b95991ade0263004e7ea
@@ -6,3 +6,4 @@
 SHA1 (patch-scipy_spatial_ckdtree_src_ckdtree__decl.h) = ad0e4a79af2a3b0667e61f205f5b8453ea440498
 SHA1 (patch-scipy_special___logit.h) = c729c2b73de00cad4c9ad834a79b80dea7b05af3
 SHA1 (patch-scipy_special___round.h) = bc05a935e6423ce8395450ad3b30e88826939422
+SHA1 (patch-scipy_stats__unuran_setup.py) = 9839f589fdfe7f1f74e84f32526a2ce96a28d04a
diff -r 42cbc1bb5ecd -r 0aa503365ed9 math/py-scipy/patches/patch-scipy_stats__unuran_setup.py
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/math/py-scipy/patches/patch-scipy_stats__unuran_setup.py  Sat Jul 30 16:13:47 2022 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-scipy_stats__unuran_setup.py,v 1.1 2022/07/30 16:13:48 he Exp $
+
+On NetBSD/powerpc, you can't build with _ISOC99_SOURCE defined,
+the include of <ieeefp.h> deep down in the python headers will fail
+with undefined types.
+
+--- ./scipy/stats/_unuran/setup.py.orig        2022-05-16 12:36:53.864307900 +0000
++++ ./scipy/stats/_unuran/setup.py
+@@ -95,7 +95,6 @@ def configuration(parent_package="", top
+         ("UNUR_ENABLE_INFO", "1"),
+         ("VERSION", '"%s"' % UNURAN_VERSION),
+         ("HAVE_CONFIG_H", "1"),
+-        ("_ISOC99_SOURCE", "1"),
+     ]
+ 
+     UNURAN_DIRS = [



Home | Main Index | Thread Index | Old Index