CVS commit: pkgsrc/math/py-numpy

["Dr. Thomas Orgis" <thor%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   thor
Date:           Tue Jan  2 19:57:46 UTC 2024

Modified Files:
        pkgsrc/math/py-numpy: Makefile

Log Message:
math/py-numpy: actually blas=blas (cblas implicit) for more correct linkage


To generate a diff of this commit:
cvs rdiff -u -r1.116 -r1.117 pkgsrc/math/py-numpy/Makefile

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

Modified files:

Index: pkgsrc/math/py-numpy/Makefile
diff -u pkgsrc/math/py-numpy/Makefile:1.116 pkgsrc/math/py-numpy/Makefile:1.117
--- pkgsrc/math/py-numpy/Makefile:1.116 Thu Dec  7 20:45:56 2023
+++ pkgsrc/math/py-numpy/Makefile       Tue Jan  2 19:57:46 2024
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.116 2023/12/07 20:45:56 thor Exp $
+# $NetBSD: Makefile,v 1.117 2024/01/02 19:57:46 thor Exp $
 
 DISTNAME=      numpy-1.26.2
-PKGREVISION=   1
+PKGREVISION=   2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=    math python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=n/numpy/}
@@ -67,10 +67,12 @@ LDFLAGS+=           ${_COMPILER_ABI_FLAG.${ABI}}
 # TODO: accelerate.framework has no pkg-config yet (see blas.buildlink3.mk).
 BLAS_ACCEPTED=         ${_BLAS_TYPES}
 BLAS_C_INTERFACE=      yes
-# Yes, cblas and lapack API (not lapacke) is desired.
+# Cblas and lapack API (not lapacke) is desired.
 # Meson build uses pkg-config since 1.26.2 (or elaborate own logic not
-# suitable here).
-WHEEL_ARGS+=           -Csetup-args=-Dblas=${CBLAS_PC}
+# suitable here) and guesses for cblas if blas lib does not contain the
+# C interface. That covers netlib for us, and openblas builds serve
+# all APIs.
+WHEEL_ARGS+=           -Csetup-args=-Dblas=${BLAS_PC}
 WHEEL_ARGS+=           -Csetup-args=-Dlapack=${LAPACK_PC}
 
 # Remove invalid __STDC_VERSION__ setting