Skip to content

Commit 0e27e56

Browse files
committed
py-numpy: just assume the __builtin_prefetch configure test works
Also bump PKGREVISION since this is an installed header.
1 parent 6f599d1 commit 0e27e56

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

math/py-numpy/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
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 $
22

33
DISTNAME= numpy-1.22.4
44
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
5-
PKGREVISION= 1
5+
PKGREVISION= 2
66
CATEGORIES= math python
77
MASTER_SITES= ${MASTER_SITE_PYPI:=n/numpy/}
88
EXTRACT_SUFX= .zip

math/py-numpy/distinfo

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
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 $
22

33
BLAKE2s (numpy-1.22.4.zip) = 020700e15b661d064377106b6c3ecd5959c524e32cc2f3d1b97739894bbbcff8
44
SHA512 (numpy-1.22.4.zip) = bb2993459157c43f8c419de98be1c832f108b4eb6b96e1d20f406eccd782681ad8d0f8653637962ac592abe7d75719c17678ec97f035f6c87d4c7f939a1a8a48
55
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
77
SHA1 (patch-numpy_core_setup.py) = 01f90b7eb700cfa51edded31498c2de4c3850848
88
SHA1 (patch-numpy_core_src_npymath_npy__math__private.h) = e3b8e751fd0b6b6c6794d714aa5f60dfe9d7f421
99
SHA1 (patch-numpy_distutils_command_config.py) = eb37d28482689703e0c1a264f9768409cf8bb4b6

math/py-numpy/patches/patch-numpy_core_include_numpy_npy__common.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
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 $
22

33
Fix build on non-x86:
44
The configure test for __builtin_prefetch is broken with clang.
@@ -11,7 +11,7 @@ _configtest.c:6:3: error: builtin functions must be directly called
1111
#endif
1212

1313
-#ifdef HAVE___BUILTIN_PREFETCH
14-
+#if !defined(__i386__) && !defined(__x86_64__)
14+
+#if 1
1515
/* unlike _mm_prefetch also works on non-x86 */
1616
#define NPY_PREFETCH(x, rw, loc) __builtin_prefetch((x), (rw), (loc))
1717
#else

0 commit comments

Comments
 (0)