[pkgsrc/trunk]: pkgsrc/math/py-numpy math/py-numpy: Actually use BLAS_LIBS an...

[thor <thor%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9396e98fd66f
branches:  trunk
changeset: 449300:9396e98fd66f
user:      thor <thor%pkgsrc.org@localhost>
date:      Thu Mar 25 21:47:50 2021 +0000

description:
math/py-numpy: Actually use BLAS_LIBS and LAPACK_LIBS.

The previous state included our BLAS choice but the build
did not honour the selected libs. This patches the config
script to not search for LAPACK and BLAS, using our settings
instead. Hopefull we can get that option upstreamed.

Approved during freeze by wiz.

diffstat:

 math/py-numpy/Makefile      |  4 +++-
 math/py-numpy/buildlink3.mk |  6 +++++-
 math/py-numpy/distinfo      |  4 ++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diffs (56 lines):

diff -r 1bd17169edbc -r 9396e98fd66f math/py-numpy/Makefile
--- a/math/py-numpy/Makefile    Thu Mar 25 19:43:44 2021 +0000
+++ b/math/py-numpy/Makefile    Thu Mar 25 21:47:50 2021 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.74 2021/01/09 09:29:41 adam Exp $
+# $NetBSD: Makefile,v 1.75 2021/03/25 21:47:50 thor Exp $
 
 DISTNAME=      numpy-1.19.5
+PKGREVISION=   1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=    math python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=n/numpy/}
@@ -18,6 +19,7 @@
 # error: 'for' loop initial declarations are only allowed in C99 mode
 USE_LANGUAGES=         c99 fortran
 MAKE_ENV+=             ATLAS=None
+MAKE_ENV+=             BLAS_LIBS=${BLAS_LIBS:Q} LAPACK_LIBS=${LAPACK_LIBS:Q}
 
 REPLACE_PYTHON+=       *.py */*.py */*/*.py */*/*/*.py */*/*/*/*.py
 
diff -r 1bd17169edbc -r 9396e98fd66f math/py-numpy/buildlink3.mk
--- a/math/py-numpy/buildlink3.mk       Thu Mar 25 19:43:44 2021 +0000
+++ b/math/py-numpy/buildlink3.mk       Thu Mar 25 21:47:50 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2020/10/13 17:32:16 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2021/03/25 21:47:50 thor Exp $
 
 BUILDLINK_TREE+=       py-numpy
 
@@ -18,6 +18,10 @@
 
 .include "../../mk/bsd.fast.prefs.mk"
 
+# Dependend python packages re-use the BLAS_LIBS logic and
+# need this in the environment.
+MAKE_ENV+=     BLAS_LIBS=${BLAS_LIBS:Q} LAPACK_LIBS=${LAPACK_LIBS:Q}
+
 .if ${OPSYS} != "Darwin"
 .include "../../mk/blas.buildlink3.mk"
 .endif
diff -r 1bd17169edbc -r 9396e98fd66f math/py-numpy/distinfo
--- a/math/py-numpy/distinfo    Thu Mar 25 19:43:44 2021 +0000
+++ b/math/py-numpy/distinfo    Thu Mar 25 21:47:50 2021 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.56 2021/01/09 09:29:41 adam Exp $
+$NetBSD: distinfo,v 1.57 2021/03/25 21:47:50 thor Exp $
 
 SHA1 (numpy-1.19.5.zip) = 61f0b3dad58ce97b14da9dccbee0722d36f26937
 RMD160 (numpy-1.19.5.zip) = 3317c98790e8c2d1d9c36279b3451f09b6776935
@@ -7,5 +7,5 @@
 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) = 01879a0ad3c5eb0133fcce46ce10a52cdd3df7a4
+SHA1 (patch-numpy_distutils_system__info.py) = 5f43d3108175dadc96a65b734c234d0b95053173
 SHA1 (patch-numpy_linalg_lapack__litemodule.c) = e97ec871c2f33c3121b3c8471a9e5a74c3c798c8