Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id E38EE1A921F for ; Tue, 12 Apr 2022 20:31:45 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id EEE3B84FBC; Tue, 12 Apr 2022 20:31:44 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 37B8484FA7 for ; Tue, 12 Apr 2022 20:31:44 +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 D506X5qt8zZg for ; Tue, 12 Apr 2022 20:31:43 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id AC19C84CFD for ; Tue, 12 Apr 2022 20:31:43 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id A59CAFB24; Tue, 12 Apr 2022 20:31:43 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1649795503146660" MIME-Version: 1.0 Date: Tue, 12 Apr 2022 20:31:43 +0000 From: "Tobias Nygren" Subject: CVS commit: pkgsrc/math/py-scipy To: pkgsrc-changes@NetBSD.org Reply-To: tnn@netbsd.org X-Mailer: log_accum Message-Id: <20220412203143.A59CAFB24@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1649795503146660 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: tnn Date: Tue Apr 12 20:31:43 UTC 2022 Modified Files: pkgsrc/math/py-scipy: distinfo Added Files: pkgsrc/math/py-scipy/patches: patch-scipy_stats___hypotests__pythran.cpp Log Message: cipy: fix build on SunOS (system header conflict) To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 pkgsrc/math/py-scipy/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/math/py-scipy/patches/patch-scipy_stats___hypotests__pythran.cpp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1649795503146660 Content-Disposition: inline Content-Length: 1794 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.30 pkgsrc/math/py-scipy/distinfo:1.31 --- pkgsrc/math/py-scipy/distinfo:1.30 Sat Apr 9 12:15:31 2022 +++ pkgsrc/math/py-scipy/distinfo Tue Apr 12 20:31:43 2022 @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.30 2022/04/09 12:15:31 adam Exp $ +$NetBSD: distinfo,v 1.31 2022/04/12 20:31:43 tnn Exp $ BLAKE2s (scipy-1.8.0.tar.gz) = 45a8dad311d6c459a748f31a7df37ce49ee611c8d4c258649288fd624e5a3a05 SHA512 (scipy-1.8.0.tar.gz) = 674652728ae76479d17189e6974895bb838a8e83b17b9fb91c5f86faebf2a1387e1466555ac5b51d05c293f9b31b9a72e634f5858105ea984ca94bd2f05bbb4c Size (scipy-1.8.0.tar.gz) = 38313602 bytes SHA1 (patch-scipy_special___round.h) = bc05a935e6423ce8395450ad3b30e88826939422 +SHA1 (patch-scipy_stats___hypotests__pythran.cpp) = e5d70b810ca020ccd25b9ad7068ce44487d8da60 Added files: Index: pkgsrc/math/py-scipy/patches/patch-scipy_stats___hypotests__pythran.cpp diff -u /dev/null pkgsrc/math/py-scipy/patches/patch-scipy_stats___hypotests__pythran.cpp:1.1 --- /dev/null Tue Apr 12 20:31:43 2022 +++ pkgsrc/math/py-scipy/patches/patch-scipy_stats___hypotests__pythran.cpp Tue Apr 12 20:31:43 2022 @@ -0,0 +1,19 @@ +$NetBSD: patch-scipy_stats___hypotests__pythran.cpp,v 1.1 2022/04/12 20:31:43 tnn Exp $ + +/usr/include/iso/ctype_iso.h on SunOS has this: +#define _P 0x00000010 /* Punctuation */ + +Kludge away this macro. + +--- scipy/stats/_hypotests_pythran.cpp.orig 2022-02-04 14:45:39.615792300 +0000 ++++ scipy/stats/_hypotests_pythran.cpp +@@ -253,6 +253,9 @@ namespace __pythran__hypotests_pythran + typename type::result_type operator()(argument_type0&& A) const + ; + } ; ++#ifdef _P ++#undef _P ++#endif + struct _P + { + typedef void callable; --_----------=_1649795503146660--