py-numpy: just assume the __builtin_prefetch configure test works Also bump PKGREVISION since this is an installed header.diff -r1.95 -r1.96 pkgsrc/math/py-numpy/Makefile
(tnn)
@@ -1,18 +1,18 @@ | @@ -1,18 +1,18 @@ | |||
1 | # $NetBSD: Makefile,v 1.95 2022/05/25 19:09:25 tnn Exp $ | 1 | # $NetBSD: Makefile,v 1.96 2022/05/25 19:22:20 tnn Exp $ | |
2 | 2 | |||
3 | DISTNAME= numpy-1.22.4 | 3 | DISTNAME= numpy-1.22.4 | |
4 | PKGNAME= ${PYPKGPREFIX}-${DISTNAME} | 4 | PKGNAME= ${PYPKGPREFIX}-${DISTNAME} | |
5 | PKGREVISION= 1 | 5 | PKGREVISION= 2 | |
6 | CATEGORIES= math python | 6 | CATEGORIES= math python | |
7 | MASTER_SITES= ${MASTER_SITE_PYPI:=n/numpy/} | 7 | MASTER_SITES= ${MASTER_SITE_PYPI:=n/numpy/} | |
8 | EXTRACT_SUFX= .zip | 8 | EXTRACT_SUFX= .zip | |
9 | 9 | |||
10 | MAINTAINER= pkgsrc-users@NetBSD.org | 10 | MAINTAINER= pkgsrc-users@NetBSD.org | |
11 | HOMEPAGE= https://www.numpy.org/ | 11 | HOMEPAGE= https://www.numpy.org/ | |
12 | COMMENT= Array processing for numbers, strings, records, and objects | 12 | COMMENT= Array processing for numbers, strings, records, and objects | |
13 | LICENSE= modified-bsd | 13 | LICENSE= modified-bsd | |
14 | 14 | |||
15 | TEST_DEPENDS+= ${PYPKGPREFIX}-hypothesis-[0-9]*:../../devel/py-hypothesis | 15 | TEST_DEPENDS+= ${PYPKGPREFIX}-hypothesis-[0-9]*:../../devel/py-hypothesis | |
16 | TEST_DEPENDS+= ${PYPKGPREFIX}-nose-[0-9]*:../../devel/py-nose | 16 | TEST_DEPENDS+= ${PYPKGPREFIX}-nose-[0-9]*:../../devel/py-nose | |
17 | TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test | 17 | TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test | |
18 | 18 |
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | $NetBSD: distinfo,v 1.74 2022/05/25 19:09:25 tnn Exp $ | 1 | $NetBSD: distinfo,v 1.75 2022/05/25 19:22:20 tnn Exp $ | |
2 | 2 | |||
3 | BLAKE2s (numpy-1.22.4.zip) = 020700e15b661d064377106b6c3ecd5959c524e32cc2f3d1b97739894bbbcff8 | 3 | BLAKE2s (numpy-1.22.4.zip) = 020700e15b661d064377106b6c3ecd5959c524e32cc2f3d1b97739894bbbcff8 | |
4 | SHA512 (numpy-1.22.4.zip) = bb2993459157c43f8c419de98be1c832f108b4eb6b96e1d20f406eccd782681ad8d0f8653637962ac592abe7d75719c17678ec97f035f6c87d4c7f939a1a8a48 | 4 | SHA512 (numpy-1.22.4.zip) = bb2993459157c43f8c419de98be1c832f108b4eb6b96e1d20f406eccd782681ad8d0f8653637962ac592abe7d75719c17678ec97f035f6c87d4c7f939a1a8a48 | |
5 | Size (numpy-1.22.4.zip) = 11458830 bytes | 5 | Size (numpy-1.22.4.zip) = 11458830 bytes | |
6 | SHA1 (patch-numpy_core_include_numpy_npy__common.h) = 2560358bbef62b72281f95b8d62b90b6c032f9c5 | 6 | SHA1 (patch-numpy_core_include_numpy_npy__common.h) = 354e336b98f634b6298d0b1d0e85ef1a9d240bff | |
7 | SHA1 (patch-numpy_core_setup.py) = 01f90b7eb700cfa51edded31498c2de4c3850848 | 7 | SHA1 (patch-numpy_core_setup.py) = 01f90b7eb700cfa51edded31498c2de4c3850848 | |
8 | SHA1 (patch-numpy_core_src_npymath_npy__math__private.h) = e3b8e751fd0b6b6c6794d714aa5f60dfe9d7f421 | 8 | SHA1 (patch-numpy_core_src_npymath_npy__math__private.h) = e3b8e751fd0b6b6c6794d714aa5f60dfe9d7f421 | |
9 | SHA1 (patch-numpy_distutils_command_config.py) = eb37d28482689703e0c1a264f9768409cf8bb4b6 | 9 | SHA1 (patch-numpy_distutils_command_config.py) = eb37d28482689703e0c1a264f9768409cf8bb4b6 | |
10 | SHA1 (patch-numpy_distutils_fcompiler_____init____.py) = 49d070da5b48bd9818b37ac3254341fa68503c53 | 10 | SHA1 (patch-numpy_distutils_fcompiler_____init____.py) = 49d070da5b48bd9818b37ac3254341fa68503c53 | |
11 | SHA1 (patch-numpy_distutils_fcompiler_g95.py) = be73b64a3e551df998b6a904d6db762bf28a98ed | 11 | SHA1 (patch-numpy_distutils_fcompiler_g95.py) = be73b64a3e551df998b6a904d6db762bf28a98ed | |
12 | SHA1 (patch-numpy_distutils_fcompiler_gnu.py) = 1ab3fd7b3f42328f4094f1b21a65c05ae4d975b7 | 12 | SHA1 (patch-numpy_distutils_fcompiler_gnu.py) = 1ab3fd7b3f42328f4094f1b21a65c05ae4d975b7 | |
13 | SHA1 (patch-numpy_linalg_lapack__litemodule.c) = e97ec871c2f33c3121b3c8471a9e5a74c3c798c8 | 13 | SHA1 (patch-numpy_linalg_lapack__litemodule.c) = e97ec871c2f33c3121b3c8471a9e5a74c3c798c8 | |
14 | SHA1 (patch-numpy_linalg_setup.py) = 867a2aba13ebb60b67ac2824a4cb1aff2e1231ee | 14 | SHA1 (patch-numpy_linalg_setup.py) = 867a2aba13ebb60b67ac2824a4cb1aff2e1231ee |
@@ -1,17 +1,17 @@ | @@ -1,17 +1,17 @@ | |||
1 | $NetBSD: patch-numpy_core_include_numpy_npy__common.h,v 1.1 2022/05/25 19:09:25 tnn Exp $ | 1 | $NetBSD: patch-numpy_core_include_numpy_npy__common.h,v 1.2 2022/05/25 19:22:20 tnn Exp $ | |
2 | 2 | |||
3 | Fix build on non-x86: | 3 | Fix build on non-x86: | |
4 | The configure test for __builtin_prefetch is broken with clang. | 4 | The configure test for __builtin_prefetch is broken with clang. | |
5 | _configtest.c:6:3: error: builtin functions must be directly called | 5 | _configtest.c:6:3: error: builtin functions must be directly called | |
6 | 6 | |||
7 | --- numpy/core/include/numpy/npy_common.h.orig 2022-05-20 05:46:10.000000000 +0000 | 7 | --- numpy/core/include/numpy/npy_common.h.orig 2022-05-20 05:46:10.000000000 +0000 | |
8 | +++ numpy/core/include/numpy/npy_common.h | 8 | +++ numpy/core/include/numpy/npy_common.h | |
9 | @@ -116,7 +116,7 @@ | 9 | @@ -116,7 +116,7 @@ | |
10 | #define NPY_UNLIKELY(x) (x) | 10 | #define NPY_UNLIKELY(x) (x) | |
11 | #endif | 11 | #endif | |
12 | 12 | |||
13 | -#ifdef HAVE___BUILTIN_PREFETCH | 13 | -#ifdef HAVE___BUILTIN_PREFETCH | |
14 | +#if !defined(__i386__) && !defined(__x86_64__) | 14 | +#if 1 | |
15 | /* unlike _mm_prefetch also works on non-x86 */ | 15 | /* unlike _mm_prefetch also works on non-x86 */ | |
16 | #define NPY_PREFETCH(x, rw, loc) __builtin_prefetch((x), (rw), (loc)) | 16 | #define NPY_PREFETCH(x, rw, loc) __builtin_prefetch((x), (rw), (loc)) | |
17 | #else | 17 | #else |