pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/math/py-scipy



Module Name:    pkgsrc
Committed By:   thor
Date:           Thu Dec  7 20:47:13 UTC 2023

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

Log Message:
py-scipy: Fix BLAS usage, using WHEEL_ARGS

See py-numpy. Also drop the bad fixed openblas dependency.


To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.74 pkgsrc/math/py-scipy/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-scipy/Makefile
diff -u pkgsrc/math/py-scipy/Makefile:1.73 pkgsrc/math/py-scipy/Makefile:1.74
--- pkgsrc/math/py-scipy/Makefile:1.73  Sun Nov 19 17:06:18 2023
+++ pkgsrc/math/py-scipy/Makefile       Thu Dec  7 20:47:13 2023
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.73 2023/11/19 17:06:18 adam Exp $
+# $NetBSD: Makefile,v 1.74 2023/12/07 20:47:13 thor Exp $
 
 DISTNAME=      scipy-1.11.4
+PKGREVISION=   1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=    math python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=s/scipy/}
@@ -52,6 +53,12 @@ FFLAGS+=     -fPIC
 
 LDFLAGS.Darwin+=       -headerpad_max_install_names
 
+# Same as for py-numpy.
+BLAS_ACCEPTED=         ${_BLAS_TYPES}
+BLAS_C_INTERFACE=      yes
+WHEEL_ARGS+=           -Csetup-args=-Dblas=${CBLAS_PC}
+WHEEL_ARGS+=           -Csetup-args=-Dlapack=${LAPACK_PC}
+
 PYTHON_VERSIONS_INCOMPATIBLE=  27 38
 
 .include "../../mk/bsd.prefs.mk"
@@ -80,7 +87,7 @@ do-test:
 .include "../../lang/python/application.mk"
 .include "../../lang/python/wheel.mk"
 .include "../../math/fftw/buildlink3.mk"
-.include "../../math/openblas/buildlink3.mk"
+.include "../../mk/blas.buildlink3.mk"
 BUILDLINK_API_DEPENDS.py-numpy+=       ${PYPKGPREFIX}-numpy>=1.21.6
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../math/py-pythran/buildlink3.mk"



Home | Main Index | Thread Index | Old Index