Page MenuHomeFreeBSD
Files F168295163

D52469.id161850.diff
No OneTemporary
Actions

D52469.id161850.diff
View Options

diff --git a/math/py-numpy/Makefile b/math/py-numpy/Makefile
--- a/math/py-numpy/Makefile
+++ b/math/py-numpy/Makefile
@@ -18,16 +18,17 @@
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=6.2.5:devel/py-pytest@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}hypothesis>=6.24.1:devel/py-hypothesis@${PY_FLAVOR} \
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hypothesis>=6.24.1:devel/py-hypothesis@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest>=6.2.5:devel/py-pytest@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}typing-extensions>=4.2.0:devel/py-typing-extensions@${PY_FLAVOR}
-USES= compiler:c11 cpe fortran python:3.9+
+USES= compiler:c11 cpe python:3.9+
USE_PYTHON= allflavors autoplist concurrent cython distutils
-GCCLIBDIR_CMDS= ${FC} -print-file-name=libgfortran.so | ${SED} -e s/libgfortran.so//
-PYDISTUTILS_CONFIGUREARGS= --fcompiler=gnu95
-PYDISTUTILS_BUILDARGS= --fcompiler=gnu95
+GCCLIBDIR_CMDS= ${FC} -print-file-name=libgfortran.so | ${SED} -e \
+ s/libgfortran.so//
+PYDISTUTILS_CONFIGUREARGS= ${PYFARGS}
+PYDISTUTILS_BUILDARGS= ${PYFARGS}
LDFLAGS+= -s
PIE_UNSAFE= yes
@@ -36,20 +37,38 @@
PORTDOCS= *
-OPTIONS_DEFINE= DOCS SUITESPARSE
-OPTIONS_DEFAULT= OPENBLAS SUITESPARSE
+OPTIONS_DEFINE= DOCS FORTRAN SUITESPARSE
+OPTIONS_DEFAULT= FORTRAN OPENBLAS SUITESPARSE
OPTIONS_SINGLE= BLASLIB
-OPTIONS_SINGLE_BLASLIB= ATLAS NETLIB OPENBLAS
+OPTIONS_SINGLE_BLASLIB= ATLAS NETLIB NOBLAS OPENBLAS
+NOBLAS_DESC= Internal NumPy fallback BLAS routines (slow!)
SUITESPARSE_DESC= Use AMD and UMFPACK in SuiteSparse
-ATLAS_USES= blaslapack:atlas
-ATLAS_VARS= BLASLIBS="ptf77blas, ptcblas" BLASNAME=atlas LAPACKLIBS=alapack LIBRARIES=atlas_libs
-NETLIB_LIB_DEPENDS= libcblas.so:math/cblas
-NETLIB_USES= blaslapack:netlib
-NETLIB_VARS= BLASLIBS="blas, cblas" BLASNAME=atlas LAPACKLIBS=lapack LIBRARIES=atlas_libs
-OPENBLAS_USES= blaslapack:openblas
-OPENBLAS_VARS= BLASLIBS="openblas, gfortran" BLASNAME=openblas LAPACKLIBS="openblas, gfortran" LIBRARIES=libraries
-SUITESPARSE_LIB_DEPENDS=libumfpack.so:math/suitesparse-umfpack
+ATLAS_IMPLIES= FORTRAN
+ATLAS_USES= blaslapack:atlas
+ATLAS_VARS= BLASLIBS="ptf77blas, ptcblas" \
+ BLASNAME=atlas \
+ LAPACKLIBS=alapack \
+ LIBRARIES=atlas_libs
+FORTRAN_USES= fortran
+FORTRAN_VARS= PYFARGS=--fcompiler=gnu95
+NETLIB_IMPLIES= FORTRAN
+NETLIB_LIB_DEPENDS= libcblas.so:math/cblas
+NETLIB_USES= blaslapack:netlib
+NETLIB_VARS= BLASLIBS="blas, cblas" \
+ BLASNAME=atlas \
+ LAPACKLIBS=lapack \
+ LIBRARIES=atlas_libs
+NOBLAS_MAKE_ENV= NPY_LAPACK_ORDER= \
+ PY_BLAS_ORDER=
+OPENBLAS_IMPLIES= FORTRAN
+OPENBLAS_USES= blaslapack:openblas
+OPENBLAS_VARS= BLASLIBS="openblas, gfortran" \
+ BLASNAME=openblas \
+ LAPACKLIBS="openblas, gfortran" \
+ LIBRARIES=libraries
+SUITESPARSE_IMPLIES= FORTRAN
+SUITESPARSE_LIB_DEPENDS= libumfpack.so:math/suitesparse-umfpack
post-extract:
@${TOUCH} ${WRKSRC}/numpy/f2py/tests/src/temp
@@ -59,11 +78,15 @@
pre-configure:
@${REINPLACE_CMD} -e 's|%%FC%%|${FC}|' ${WRKSRC}/numpy/distutils/fcompiler/gnu.py
@${CP} ${FILESDIR}/site.cfg ${WRKSRC}/site.cfg
+
+pre-configure-FORTRAN-on:
+ @${REINPLACE_CMD} -e "s|%%GCCLIBDIR%%|$$(${GCCLIBDIR_CMDS})|" ${WRKSRC}/site.cfg ${WRKSRC}/numpy/distutils/system_info.py
+
+pre-configure-NOBLAS-off:
${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
-e 's|%%BLASLIBS%%|${BLASLIBS}|; s|%%BLASNAME%%|${BLASNAME}|' \
-e 's|%%LAPACKLIBS%%|${LAPACKLIBS}|; s|%%LIBRARIES%%|${LIBRARIES}|' \
${WRKSRC}/site.cfg
- @${REINPLACE_CMD} -e "s|%%GCCLIBDIR%%|$$(${GCCLIBDIR_CMDS})|" ${WRKSRC}/site.cfg ${WRKSRC}/numpy/distutils/system_info.py
pre-configure-SUITESPARSE-off:
@${REINPLACE_CMD} -e 's|:%%LOCALBASE%%/include/suitesparse||' ${WRKSRC}/site.cfg

File Metadata

Mime Type
text/plain
Expires
Fri, Aug 28, 11:38 AM (8 h, 13 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
37452010
Default Alt Text
D52469.id161850.diff (3 KB)

Event Timeline