Received: by mail.netbsd.org (Postfix, from userid 605) id A8C4184E6D; Sat, 30 Jul 2022 16:13:49 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id E02F284D6B for ; Sat, 30 Jul 2022 16:13:48 +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 kRSXnHDWHmWw for ; Sat, 30 Jul 2022 16:13:48 +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 46A1284C13 for ; Sat, 30 Jul 2022 16:13:48 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 3F723FB1A; Sat, 30 Jul 2022 16:13:48 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_165919762825280" MIME-Version: 1.0 Date: Sat, 30 Jul 2022 16:13:48 +0000 From: "Havard Eidnes" Subject: CVS commit: pkgsrc/math/py-scipy To: pkgsrc-changes@NetBSD.org Reply-To: he@netbsd.org X-Mailer: log_accum Message-Id: <20220730161348.3F723FB1A@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_165919762825280 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: he Date: Sat Jul 30 16:13:48 UTC 2022 Modified Files: pkgsrc/math/py-scipy: Makefile distinfo Added Files: pkgsrc/math/py-scipy/patches: patch-scipy_stats__unuran_setup.py Log Message: 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. To generate a diff of this commit: cvs rdiff -u -r1.59 -r1.60 pkgsrc/math/py-scipy/Makefile cvs rdiff -u -r1.36 -r1.37 pkgsrc/math/py-scipy/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/math/py-scipy/patches/patch-scipy_stats__unuran_setup.py Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_165919762825280 Content-Disposition: inline Content-Length: 2502 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/math/py-scipy/Makefile diff -u pkgsrc/math/py-scipy/Makefile:1.59 pkgsrc/math/py-scipy/Makefile:1.60 --- pkgsrc/math/py-scipy/Makefile:1.59 Tue Jun 28 11:34:45 2022 +++ pkgsrc/math/py-scipy/Makefile Sat Jul 30 16:13:47 2022 @@ -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/} Index: pkgsrc/math/py-scipy/distinfo diff -u pkgsrc/math/py-scipy/distinfo:1.36 pkgsrc/math/py-scipy/distinfo:1.37 --- pkgsrc/math/py-scipy/distinfo:1.36 Fri May 27 16:59:50 2022 +++ pkgsrc/math/py-scipy/distinfo Sat Jul 30 16:13:47 2022 @@ -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 @@ Size (scipy-1.8.1.tar.gz) = 38196215 byt 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 Added files: Index: pkgsrc/math/py-scipy/patches/patch-scipy_stats__unuran_setup.py diff -u /dev/null pkgsrc/math/py-scipy/patches/patch-scipy_stats__unuran_setup.py:1.1 --- /dev/null Sat Jul 30 16:13:48 2022 +++ pkgsrc/math/py-scipy/patches/patch-scipy_stats__unuran_setup.py Sat Jul 30 16:13:48 2022 @@ -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 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 = [ --_----------=_165919762825280--