Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_161679086888860"
MIME-Version: 1.0
Date: Fri, 26 Mar 2021 20:34:28 +0000
From: "Dr. Thomas Orgis" <thor@netbsd.org>
Subject: CVS commit: pkgsrc/math/py-numpy
To: pkgsrc-changes@NetBSD.org
Reply-To: thor@netbsd.org
Message-Id: <20210326203429.00561FA95@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_161679086888860
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	thor
Date:		Fri Mar 26 20:34:28 UTC 2021

Modified Files:
	pkgsrc/math/py-numpy: Makefile distinfo
	pkgsrc/math/py-numpy/patches: patch-numpy_distutils_system__info.py

Log Message:
math/py-numpy: hotfix for building py-scipy

The downstream configure code freaked out when info['define_macros'] was not set.
It is now defined and empty.

I hope it's fine to just push this without further notice.

Build was confirmed by oster on NetBSD-9.1/amd64 and tested by me
on Linux/amd64.


To generate a diff of this commit:
cvs rdiff -u -r1.75 -r1.76 pkgsrc/math/py-numpy/Makefile
cvs rdiff -u -r1.57 -r1.58 pkgsrc/math/py-numpy/distinfo
cvs rdiff -u -r1.4 -r1.5 \
    pkgsrc/math/py-numpy/patches/patch-numpy_distutils_system__info.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_161679086888860
Content-Disposition: inline
Content-Length: 4104
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/math/py-numpy/Makefile
diff -u pkgsrc/math/py-numpy/Makefile:1.75 pkgsrc/math/py-numpy/Makefile:1.76
--- pkgsrc/math/py-numpy/Makefile:1.75	Thu Mar 25 21:47:50 2021
+++ pkgsrc/math/py-numpy/Makefile	Fri Mar 26 20:34:28 2021
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.75 2021/03/25 21:47:50 thor Exp $
+# $NetBSD: Makefile,v 1.76 2021/03/26 20:34:28 thor Exp $
 
 DISTNAME=	numpy-1.19.5
-PKGREVISION=	1
+PKGREVISION=	2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	math python
 MASTER_SITES=	${MASTER_SITE_PYPI:=n/numpy/}

Index: pkgsrc/math/py-numpy/distinfo
diff -u pkgsrc/math/py-numpy/distinfo:1.57 pkgsrc/math/py-numpy/distinfo:1.58
--- pkgsrc/math/py-numpy/distinfo:1.57	Thu Mar 25 21:47:50 2021
+++ pkgsrc/math/py-numpy/distinfo	Fri Mar 26 20:34:28 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.57 2021/03/25 21:47:50 thor Exp $
+$NetBSD: distinfo,v 1.58 2021/03/26 20:34:28 thor Exp $
 
 SHA1 (numpy-1.19.5.zip) = 61f0b3dad58ce97b14da9dccbee0722d36f26937
 RMD160 (numpy-1.19.5.zip) = 3317c98790e8c2d1d9c36279b3451f09b6776935
@@ -7,5 +7,5 @@ Size (numpy-1.19.5.zip) = 7318340 bytes
 SHA1 (patch-numpy_distutils_fcompiler_____init____.py) = 49d070da5b48bd9818b37ac3254341fa68503c53
 SHA1 (patch-numpy_distutils_fcompiler_g95.py) = be73b64a3e551df998b6a904d6db762bf28a98ed
 SHA1 (patch-numpy_distutils_fcompiler_gnu.py) = 1d62e1c5e35de0f2cf975de38f62df7f10c71d74
-SHA1 (patch-numpy_distutils_system__info.py) = 5f43d3108175dadc96a65b734c234d0b95053173
+SHA1 (patch-numpy_distutils_system__info.py) = e01c0ca1a7151f77ac9cfbccd44da44a0d354931
 SHA1 (patch-numpy_linalg_lapack__litemodule.c) = e97ec871c2f33c3121b3c8471a9e5a74c3c798c8

Index: pkgsrc/math/py-numpy/patches/patch-numpy_distutils_system__info.py
diff -u pkgsrc/math/py-numpy/patches/patch-numpy_distutils_system__info.py:1.4 pkgsrc/math/py-numpy/patches/patch-numpy_distutils_system__info.py:1.5
--- pkgsrc/math/py-numpy/patches/patch-numpy_distutils_system__info.py:1.4	Thu Mar 25 22:09:07 2021
+++ pkgsrc/math/py-numpy/patches/patch-numpy_distutils_system__info.py	Fri Mar 26 20:34:28 2021
@@ -1,10 +1,10 @@
-$NetBSD: patch-numpy_distutils_system__info.py,v 1.4 2021/03/25 22:09:07 thor Exp $
+$NetBSD: patch-numpy_distutils_system__info.py,v 1.5 2021/03/26 20:34:28 thor Exp $
 
 Disable openblas detection.  In pkgsrc, use mk/blas.buildlink.mk.
 
 --- numpy/distutils/system_info.py.orig	2020-06-02 05:24:58.000000000 +0000
 +++ numpy/distutils/system_info.py
-@@ -1730,34 +1722,15 @@ class lapack_opt_info(system_info):
+@@ -1730,34 +1722,18 @@ class lapack_opt_info(system_info):
          return getattr(self, '_calc_info_{}'.format(name))()
  
      def calc_info(self):
@@ -41,6 +41,9 @@ Disable openblas detection.  In pkgsrc, 
 +        # if it is not set.
 +        info = {}
 +        info['language'] = 'f77'
++        info['libraries'] = []
++        info['include_dirs'] = []
++        info['define_macros'] = []
 +        info['extra_link_args'] = os.environ['LAPACK_LIBS'].split()
 + 
 +        self.set_info(**info)
@@ -48,7 +51,7 @@ Disable openblas detection.  In pkgsrc, 
  
  
  class _ilp64_opt_info_mixin:
-@@ -1875,32 +1848,19 @@ class blas_opt_info(system_info):
+@@ -1875,32 +1848,22 @@ class blas_opt_info(system_info):
          return getattr(self, '_calc_info_{}'.format(name))()
  
      def calc_info(self):
@@ -82,11 +85,14 @@ Disable openblas detection.  In pkgsrc, 
 +        # Existence of BLAS_LIBS is mandatory. Things shall break early
 +        # if it is not set.
 +        info = {}
-+        # I do not want to assume a language. It is potentially mixed anyway.
-+        #info['language'] = 'c'
++        # We assume a generic BLAS, which is a Fortran lib.
++        info['language'] = 'f77'
 +        # Try to work without cblas, just link BLAS_LIBS.
 +        #info['libraries'] = ['cblas']
 +        #info['define_macros'] = [('HAVE_CBLAS', None)]
++        info['libraries'] = []
++        info['include_dirs'] = []
++        info['define_macros'] = []
 +        info['extra_link_args'] = os.environ['BLAS_LIBS'].split()
 + 
 +        self.set_info(**info)


--_----------=_161679086888860--