Attachment 220299 Details for Bug 251626 – numpy1194.patch

[patch] numpy1194.patch

numpy1194.patch (text/plain), 7.53 KB, created by Val Packett on 2020-12-06 00:11:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Val Packett

Created: 2020-12-06 00:11:11 UTC

Size: 7.53 KB

patch

obsolete

>diff --git c/math/py-numpy/Makefile w/math/py-numpy/Makefile
>index e06ff0931d52..50a060f06fc3 100644
>--- c/math/py-numpy/Makefile
>+++ w/math/py-numpy/Makefile
>@@ -1,77 +1,79 @@
> # Created by: Tony Maher
> # $FreeBSD$
> 
> PORTNAME=	numpy
>-PORTVERSION=	1.16.6
>+PORTVERSION=	1.19.4
> PORTEPOCH=	1
> CATEGORIES=	math python
> MASTER_SITES=	CHEESESHOP \
>-		https://docs.scipy.org/doc/${PORTNAME}-${PORTVERSION}/:doc
>+		https://numpy.org/doc/${PORTVERSION:R}/:doc
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
> DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
>-		${PORTNAME}-ref-${PORTVERSION:R}.1.pdf:doc \
>-		${PORTNAME}-user-${PORTVERSION:R}.1.pdf:doc
>+		${PORTNAME}-ref.pdf:doc \
>+		${PORTNAME}-user.pdf:doc
> EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
> 
> MAINTAINER=	python@FreeBSD.org
> COMMENT=	The New Numeric Extension to Python
> 
> LICENSE=	BSD3CLAUSE
> LICENSE_FILE=	${WRKSRC}/LICENSE.txt
> 
>-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR}
>+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}hypothesis>=0:devel/py-hypothesis@${PY_FLAVOR}
> 
> USES=		compiler:c11 fortran python zip
> USE_PYTHON=	allflavors autoplist concurrent cython distutils
> 
> GCCLIBDIR_CMDS=	${FC} -print-file-name=libgfortran.so | ${SED} -e s/libgfortran.so//
> LDFLAGS+=	-shared
> PYDISTUTILS_BUILDARGS=		--fcompiler=gnu95
> PYDISTUTILS_CONFIGUREARGS=	--fcompiler=gnu95
> 
> PORTDOCS=	*
> 
> OPTIONS_DEFINE=		DOCS SUITESPARSE
> OPTIONS_SINGLE=		BLASLIB
> OPTIONS_SINGLE_BLASLIB=	ATLAS NETLIB OPENBLAS
> OPTIONS_DEFAULT=	OPENBLAS SUITESPARSE
> SUITESPARSE_DESC=	Use AMD and UMFPACK in SuiteSparse
> 
> ATLAS_USES=		blaslapack:atlas
> ATLAS_VARS=		BLASLIBS="ptf77blas, ptcblas" BLASNAME=atlas LAPACKLIBS=alpack LIBRARIES=atlas_libs
> NETLIB_USES=		blaslapack:netlib
> NETLIB_VARS=		BLASLIBS="blas, cblas" BLASNAME=atlas LAPACKLIBS=lapack LIBRARIES=atlas_libs
> NETLIB_LIB_DEPENDS=	libcblas.so:math/cblas
> OPENBLAS_USES=		blaslapack:openblas
> OPENBLAS_VARS=		BLASLIBS="openblas, gfortran" BLASNAME=openblas LAPACKLIBS="openblas, gfortran" LIBRARIES=libraries
> SUITESPARSE_LIB_DEPENDS=libumfpack.so:math/suitesparse
> 
> post-extract:
> 	@${TOUCH} ${WRKSRC}/numpy/f2py/tests/src/temp
> 
> post-patch:
> 	@${REINPLACE_CMD} -e 's|%%FC%%|${FC}|' ${WRKSRC}/numpy/distutils/fcompiler/gnu.py
> 	@${CP} ${FILESDIR}/site.cfg ${WRKSRC}/site.cfg
> 
> post-patch-SUITESPARSE-off:
> 	@${REINPLACE_CMD} -e 's|:%%LOCALBASE%%/include/suitesparse||' ${WRKSRC}/site.cfg
> 
> pre-configure:
> 	${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
> 
> post-install:
> 	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' | ${XARGS} ${STRIP_CMD}
>+	${REINPLACE_CMD} -e '\|_examples/$$|d' ${_PYTHONPKGLIST}
> 
> post-install-DOCS-on:
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>-	${INSTALL_DATA} ${DISTDIR}/${PORTNAME}-ref-${PORTVERSION:R}.1.pdf ${STAGEDIR}${DOCSDIR}
>-	${INSTALL_DATA} ${DISTDIR}/${PORTNAME}-user-${PORTVERSION:R}.1.pdf ${STAGEDIR}${DOCSDIR}
>+	${INSTALL_DATA} ${DISTDIR}/${PORTNAME}-ref.pdf ${STAGEDIR}${DOCSDIR}
>+	${INSTALL_DATA} ${DISTDIR}/${PORTNAME}-user.pdf ${STAGEDIR}${DOCSDIR}
> 
> do-test:
> 	@cd ${WRKSRC} && ${PYTHON_CMD} runtests.py
> 
> .include <bsd.port.mk>
>diff --git c/math/py-numpy/distinfo w/math/py-numpy/distinfo
>index 44663a5c50f5..504e30701d39 100644
>--- c/math/py-numpy/distinfo
>+++ w/math/py-numpy/distinfo
>@@ -1,7 +1,7 @@
>-TIMESTAMP = 1588013658
>-SHA256 (numpy-1.16.6.zip) = e5cf3fdf13401885e8eea8170624ec96225e2174eb0c611c6f26dd33b489e3ff
>-SIZE (numpy-1.16.6.zip) = 5143340
>-SHA256 (numpy-ref-1.16.1.pdf) = 5296c4949c92d00ae2c94ce65b78369b8081995dc72447bb20b6518bfaed3552
>-SIZE (numpy-ref-1.16.1.pdf) = 5175448
>-SHA256 (numpy-user-1.16.1.pdf) = aa8c591eee4c537768854f19e3cf4b861280828c19eb9d2e6194ea230570ea75
>-SIZE (numpy-user-1.16.1.pdf) = 592508
>+TIMESTAMP = 1606923411
>+SHA256 (numpy-1.19.4.zip) = 141ec3a3300ab89c7f2b0775289954d193cc8edb621ea05f99db9cb181530512
>+SIZE (numpy-1.19.4.zip) = 7315971
>+SHA256 (numpy-ref.pdf) = 5fcfceb4c483bfe73ddf9ef5bd980e174dc5a540586c0f474b48c6a662ed51ef
>+SIZE (numpy-ref.pdf) = 7127190
>+SHA256 (numpy-user.pdf) = 4dc62ac6ee0838f83d13e2761851a9931f73301ef99d4eea44297228a644aeb5
>+SIZE (numpy-user.pdf) = 4045474
>diff --git c/math/py-numpy/files/patch-numpy-distutils-system_info.py w/math/py-numpy/files/patch-numpy-distutils-system_info.py
>index 299f98311648..94c5675546b6 100644
>--- c/math/py-numpy/files/patch-numpy-distutils-system_info.py
>+++ w/math/py-numpy/files/patch-numpy-distutils-system_info.py
>@@ -1,64 +1,22 @@
> --- numpy/distutils/system_info.py.orig	2019-08-27 21:01:36 UTC
> +++ numpy/distutils/system_info.py
> @@ -172,6 +172,8 @@ def _c_string_literal(s):
>      Convert a python string into a literal suitable for inclusion into C code
>      """
>      # only these three characters are forbidden in C strings
> +    if s is None:
> +        return '"None"'
>      s = s.replace('\\', r'\\')
>      s = s.replace('"',  r'\"')
>      s = s.replace('\n', r'\n')
> @@ -1112,8 +1114,8 @@ class atlas_info(system_info):
>      dir_env_var = 'ATLAS'
>      _lib_names = ['f77blas', 'cblas']
>      if sys.platform[:7] == 'freebsd':
> -        _lib_atlas = ['atlas_r']
> -        _lib_lapack = ['alapack_r']
> +        _lib_atlas = ['atlas']
> +        _lib_lapack = ['alapack']
>      else:
>          _lib_atlas = ['atlas']
>          _lib_lapack = ['lapack']
>-@@ -1633,11 +1635,6 @@ class blas_opt_info(system_info):
>-             self.set_info(**blis_info)
>-             return
>- 
>--        openblas_info = get_info('openblas')
>--        if openblas_info:
>--            self.set_info(**openblas_info)
>--            return
>--
>-         atlas_info = get_info('atlas_3_10_blas_threads')
>-         if not atlas_info:
>-             atlas_info = get_info('atlas_3_10_blas')
>-@@ -1730,18 +1727,17 @@ class blas_info(system_info):
>-                 # check we can link (find library)
>-                 # some systems have separate cblas and blas libs. First
>-                 # check for cblas lib, and if not present check for blas lib.
>--                try:
>--                    c.link_executable(obj, os.path.join(tmpdir, "a.out"),
>--                                      libraries=["cblas"],
>--                                      library_dirs=info['library_dirs'],
>--                                      extra_postargs=info.get('extra_link_args', []))
>--                    res = "cblas"
>--                except distutils.ccompiler.LinkError:
>--                    c.link_executable(obj, os.path.join(tmpdir, "a.out"),
>--                                      libraries=["blas"],
>--                                      library_dirs=info['library_dirs'],
>--                                      extra_postargs=info.get('extra_link_args', []))
>--                    res = "blas"
>-+                res = None
>-+                for libname in ['cblas', 'blas', 'openblas']:
>-+                    try:
>-+                        c.link_executable(obj, os.path.join(tmpdir, "a.out"),
>-+                                          libraries=[libname],
>-+                                          library_dirs=info['library_dirs'],
>-+                                          extra_postargs=info.get('extra_link_args', []))
>-+                        res = libname
>-+                        break
>-+                    except distutils.ccompiler.LinkError:
>-+                        pass
>-             except distutils.ccompiler.CompileError:
>-                 res = None
>-         finally:

Actions: View | Diff

Attachments on bug 251626: 220299 | 220988 | 221265 | 223412 | 223519 | 224438 | 225259 | 225274 | 225466 | 225467 | 225511 | 227029