pkgsrc-WIP-changes archive

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

py-numpy: add blas/lapack libraries to LDFLAGS to fix build



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%gatalith.at@localhost>
Pushed By:	wiz
Date:		Fri Nov 17 15:36:25 2023 +0100
Changeset:	0535e87914aa5d148dbe14a05b586465d8beb835

Modified Files:
	py-numpy/Makefile

Log Message:
py-numpy: add blas/lapack libraries to LDFLAGS to fix build

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=0535e87914aa5d148dbe14a05b586465d8beb835

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

diffstat:
 py-numpy/Makefile | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diffs:
diff --git a/py-numpy/Makefile b/py-numpy/Makefile
index a3c6fcc88c..32f4579be3 100644
--- a/py-numpy/Makefile
+++ b/py-numpy/Makefile
@@ -51,6 +51,7 @@ LDFLAGS+=		${_COMPILER_ABI_FLAG.${ABI}}
 BLAS_ACCEPTED=		${_BLAS_TYPES} accelerate.framework
 BLAS_C_INTERFACE=	yes
 CPPFLAGS+=		${BLAS_INCLUDES}
+LDFLAGS+=		${CBLAS_LIBS} ${LAPACK_LIBS}
 
 # Remove invalid __STDC_VERSION__ setting
 BUILDLINK_TRANSFORM.SunOS+=	rm:-D__STDC_VERSION__=0
@@ -61,14 +62,8 @@ pre-configure:
 post-install:
 	cd ${DESTDIR}${PREFIX}/bin && ${MV} f2py f2py-${PYVERSSUFFIX} || ${TRUE}
 
-# since this overrides the build target, it needs to request the necessary dependencies
-TOOL_DEPENDS+=	${PYPKGPREFIX}-build-[0-9]*:../../devel/py-build
-do-build:
-	${RUN} cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${TOOL_PYTHONBIN} \
-		-m build --wheel --skip-dependency-check --no-isolation \
-		-Csetup-args=-Dblas=${BLAS_PC} -Csetup-args=-Dlapack=${LAPACKE_PC}
-# as of 1.24.2
-# 29 failed, 26625 passed, 1481 skipped, 1307 deselected, 35 xfailed, 2 xpassed, 40 warnings
+# as of 1.26.1
+# 28 failed, 38180 passed, 200 skipped, 1304 deselected, 33 xfailed, 1 xpassed, 52 warnings
 do-test:
 	cd ${WRKDIR} && \
 	${SETENV} ${TEST_ENV} PYTHONPATH=${DESTDIR}${PREFIX}/${PYSITELIB} ${PYTHONBIN} -c "import numpy; numpy.test()"


Home | Main Index | Thread Index | Old Index