Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 49CD684EBD for ; Mon, 17 Jul 2023 19:26:38 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id bKtzq3qrqCDG for ; Mon, 17 Jul 2023 19:26:37 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id B10CF84D31 for ; Mon, 17 Jul 2023 19:26:37 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id A58D1FBDB; Mon, 17 Jul 2023 19:26:37 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1689621997199710" MIME-Version: 1.0 Date: Mon, 17 Jul 2023 19:26:37 +0000 From: "Tobias Nygren" Subject: CVS commit: pkgsrc/math/py-scipy To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: tnn@netbsd.org X-Mailer: log_accum Message-Id: <20230717192637.A58D1FBDB@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_1689621997199710 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: tnn Date: Mon Jul 17 19:26:37 UTC 2023 Modified Files: pkgsrc/math/py-scipy: distinfo Added Files: pkgsrc/math/py-scipy/patches: patch-scipy_spatial___ckdtree.pyx Log Message: py-scipy: revert removal of patch-scipy_spatial___ckdtree.pyx This patch is still needed. Updated patch comment to clarify. To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 pkgsrc/math/py-scipy/distinfo cvs rdiff -u -r0 -r1.3 \ pkgsrc/math/py-scipy/patches/patch-scipy_spatial___ckdtree.pyx Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1689621997199710 Content-Disposition: inline Content-Length: 2336 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/math/py-scipy/distinfo diff -u pkgsrc/math/py-scipy/distinfo:1.44 pkgsrc/math/py-scipy/distinfo:1.45 --- pkgsrc/math/py-scipy/distinfo:1.44 Wed Jul 12 16:26:29 2023 +++ pkgsrc/math/py-scipy/distinfo Mon Jul 17 19:26:37 2023 @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.44 2023/07/12 16:26:29 adam Exp $ +$NetBSD: distinfo,v 1.45 2023/07/17 19:26:37 tnn Exp $ BLAKE2s (scipy-1.11.1.tar.gz) = 1fe93584ad30db4c1e2686cb74ad291e3f62ffe49c4d8afcc6d1d5bccfd26268 SHA512 (scipy-1.11.1.tar.gz) = 2859fc73c4fef713497f450b76a57d274bb46477a08ac909714823225f065a13c1e42a61ce67575cfc475e1e4612090cc4ca0920411fe32370c5b5c476352f97 Size (scipy-1.11.1.tar.gz) = 56031509 bytes +SHA1 (patch-scipy_spatial___ckdtree.pyx) = 757c1f333ff8e4271b7a5db6341be0527762ee70 SHA1 (patch-scipy_spatial_ckdtree_src_ckdtree__decl.h) = c5684427731eef00c012b1ebc7fba00da560f493 SHA1 (patch-scipy_special_Faddeeva.hh) = 9f6c0bb808fc9be0a1c1b7e65395d29f13821233 SHA1 (patch-scipy_special_sf__error.c) = 416489193a6ff90caaa95f489a452f23f0a27bbe Added files: Index: pkgsrc/math/py-scipy/patches/patch-scipy_spatial___ckdtree.pyx diff -u /dev/null pkgsrc/math/py-scipy/patches/patch-scipy_spatial___ckdtree.pyx:1.3 --- /dev/null Mon Jul 17 19:26:37 2023 +++ pkgsrc/math/py-scipy/patches/patch-scipy_spatial___ckdtree.pyx Mon Jul 17 19:26:37 2023 @@ -0,0 +1,21 @@ +$NetBSD: patch-scipy_spatial___ckdtree.pyx,v 1.3 2023/07/17 19:26:37 tnn Exp $ + +Fix missing isnan/isinf. +Build breaks on at least NetBSD/aarch64 without this: + +scipy/spatial/_ckdtree.cxx: In function 'PyObject* __pyx_pf_5scipy_7spatial_8_ckdtree_7cKDTree_16count_neighbors(__pyx_obj_5scipy_7spatial_8_ckdtree_cKDTree*, __pyx_obj_5scipy_7spatial_8_ckdtree_cKDTree*, PyObject*, __pyx_t_5numpy_float64_t, PyObject*, int)': +scipy/spatial/_ckdtree.cxx:13392:19: error: 'isinf' was not declared in this scope; did you mean 'std::isinf'? + +--- scipy/spatial/_ckdtree.pyx.orig 1970-01-01 00:00:00.000000000 +0000 ++++ scipy/spatial/_ckdtree.pyx +@@ -16,7 +16,9 @@ cimport numpy as np + from cpython.mem cimport PyMem_Malloc, PyMem_Free + from libcpp.vector cimport vector + from libcpp cimport bool +-from libc.math cimport isinf, INFINITY ++from libc.math cimport INFINITY ++cdef extern from "" namespace "std": ++ bool isinf(double) + + cimport cython + import os --_----------=_1689621997199710--