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 623491A921F for ; Tue, 12 Apr 2022 11:50:36 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 9606084F87; Tue, 12 Apr 2022 11:50:35 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id D05E084E6E for ; Tue, 12 Apr 2022 11:50:34 +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 VprG5u7ASPsI for ; Tue, 12 Apr 2022 11:50:34 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 40BE384D0E for ; Tue, 12 Apr 2022 11:50:34 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 3E105FB24; Tue, 12 Apr 2022 11:50:34 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1649764234188570" MIME-Version: 1.0 Date: Tue, 12 Apr 2022 11:50:34 +0000 From: "Tobias Nygren" Subject: CVS commit: pkgsrc/math/py-numpy To: pkgsrc-changes@NetBSD.org Reply-To: tnn@netbsd.org X-Mailer: log_accum Message-Id: <20220412115034.3E105FB24@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1649764234188570 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: tnn Date: Tue Apr 12 11:50:34 UTC 2022 Modified Files: pkgsrc/math/py-numpy: distinfo pkgsrc/math/py-numpy/patches: patch-numpy_core_setup.py Log Message: py-numpy: fix build on SunOS To generate a diff of this commit: cvs rdiff -u -r1.70 -r1.71 pkgsrc/math/py-numpy/distinfo cvs rdiff -u -r1.5 -r1.6 \ pkgsrc/math/py-numpy/patches/patch-numpy_core_setup.py Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1649764234188570 Content-Disposition: inline Content-Length: 2930 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/math/py-numpy/distinfo diff -u pkgsrc/math/py-numpy/distinfo:1.70 pkgsrc/math/py-numpy/distinfo:1.71 --- pkgsrc/math/py-numpy/distinfo:1.70 Sun Apr 10 13:15:47 2022 +++ pkgsrc/math/py-numpy/distinfo Tue Apr 12 11:50:33 2022 @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.70 2022/04/10 13:15:47 tnn Exp $ +$NetBSD: distinfo,v 1.71 2022/04/12 11:50:33 tnn Exp $ BLAKE2s (numpy-1.22.3.zip) = 8add725a5f6a438218d1df65e832acf84264fcdf59eaf006b5f80c4b492f0905 SHA512 (numpy-1.22.3.zip) = fdeefd0ffad798a078376fe16ad840551309d3bbf551eca09d92a35048ee75c3739ab0becedb23448d82999da148827e69ded8842201c3dda72b46b4eb9be93f Size (numpy-1.22.3.zip) = 11451867 bytes -SHA1 (patch-numpy_core_setup.py) = 70db6193da36d31a085036e2b61b154e990f70de +SHA1 (patch-numpy_core_setup.py) = 57659fe39504adc789a14016c5a43d7b898789b4 SHA1 (patch-numpy_core_src_npymath_npy__math__private.h) = e3b8e751fd0b6b6c6794d714aa5f60dfe9d7f421 SHA1 (patch-numpy_distutils_fcompiler_____init____.py) = 49d070da5b48bd9818b37ac3254341fa68503c53 SHA1 (patch-numpy_distutils_fcompiler_g95.py) = be73b64a3e551df998b6a904d6db762bf28a98ed Index: pkgsrc/math/py-numpy/patches/patch-numpy_core_setup.py diff -u pkgsrc/math/py-numpy/patches/patch-numpy_core_setup.py:1.5 pkgsrc/math/py-numpy/patches/patch-numpy_core_setup.py:1.6 --- pkgsrc/math/py-numpy/patches/patch-numpy_core_setup.py:1.5 Mon May 3 17:15:22 2021 +++ pkgsrc/math/py-numpy/patches/patch-numpy_core_setup.py Tue Apr 12 11:50:34 2022 @@ -1,10 +1,14 @@ -$NetBSD: patch-numpy_core_setup.py,v 1.5 2021/05/03 17:15:22 adam Exp $ +$NetBSD: patch-numpy_core_setup.py,v 1.6 2022/04/12 11:50:34 tnn Exp $ Use C language (not F77 from blas_info); fixes library name on Darwin. ---- numpy/core/setup.py.orig 2021-04-22 17:50:58.000000000 +0000 +Don't redefine -D__STDC_VERSION__=0 on the command line. It is almost +certainly the wrong thing to do and breaks the build completely on +modern SunOS. + +--- numpy/core/setup.py.orig 2022-03-06 17:04:34.000000000 +0000 +++ numpy/core/setup.py -@@ -760,6 +760,7 @@ def configuration(parent_package='',top_ +@@ -816,6 +816,7 @@ def configuration(parent_package='',top_ if have_blas: extra_info = blas_info @@ -12,3 +16,11 @@ Use C language (not F77 from blas_info); # These files are also in MANIFEST.in so that they are always in # the source distribution independently of HAVE_CBLAS. common_src.extend([join('src', 'common', 'cblasfuncs.c'), +@@ -1038,7 +1039,6 @@ def configuration(parent_package='',top_ + extra_objects=svml_objs, + extra_info=extra_info, + extra_cxx_compile_args=['-std=c++11', +- '-D__STDC_VERSION__=0', + '-fno-exceptions', + '-fno-rtti']) + --_----------=_1649764234188570--