CVS commit: pkgsrc/math/py-numpy

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Wed May 25 19:22:20 UTC 2022

Modified Files:
        pkgsrc/math/py-numpy: Makefile distinfo
        pkgsrc/math/py-numpy/patches:
            patch-numpy_core_include_numpy_npy__common.h

Log Message:
py-numpy: just assume the __builtin_prefetch configure test works

Also bump PKGREVISION since this is an installed header.


To generate a diff of this commit:
cvs rdiff -u -r1.95 -r1.96 pkgsrc/math/py-numpy/Makefile
cvs rdiff -u -r1.74 -r1.75 pkgsrc/math/py-numpy/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/math/py-numpy/patches/patch-numpy_core_include_numpy_npy__common.h

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

Modified files:

Index: pkgsrc/math/py-numpy/Makefile
diff -u pkgsrc/math/py-numpy/Makefile:1.95 pkgsrc/math/py-numpy/Makefile:1.96
--- pkgsrc/math/py-numpy/Makefile:1.95  Wed May 25 19:09:25 2022
+++ pkgsrc/math/py-numpy/Makefile       Wed May 25 19:22:20 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.95 2022/05/25 19:09:25 tnn Exp $
+# $NetBSD: Makefile,v 1.96 2022/05/25 19:22:20 tnn Exp $
 
 DISTNAME=      numpy-1.22.4
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    math python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=n/numpy/}
 EXTRACT_SUFX=  .zip

Index: pkgsrc/math/py-numpy/distinfo
diff -u pkgsrc/math/py-numpy/distinfo:1.74 pkgsrc/math/py-numpy/distinfo:1.75
--- pkgsrc/math/py-numpy/distinfo:1.74  Wed May 25 19:09:25 2022
+++ pkgsrc/math/py-numpy/distinfo       Wed May 25 19:22:20 2022
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.74 2022/05/25 19:09:25 tnn Exp $
+$NetBSD: distinfo,v 1.75 2022/05/25 19:22:20 tnn Exp $
 
 BLAKE2s (numpy-1.22.4.zip) = 020700e15b661d064377106b6c3ecd5959c524e32cc2f3d1b97739894bbbcff8
 SHA512 (numpy-1.22.4.zip) = bb2993459157c43f8c419de98be1c832f108b4eb6b96e1d20f406eccd782681ad8d0f8653637962ac592abe7d75719c17678ec97f035f6c87d4c7f939a1a8a48
 Size (numpy-1.22.4.zip) = 11458830 bytes
-SHA1 (patch-numpy_core_include_numpy_npy__common.h) = 2560358bbef62b72281f95b8d62b90b6c032f9c5
+SHA1 (patch-numpy_core_include_numpy_npy__common.h) = 354e336b98f634b6298d0b1d0e85ef1a9d240bff
 SHA1 (patch-numpy_core_setup.py) = 01f90b7eb700cfa51edded31498c2de4c3850848
 SHA1 (patch-numpy_core_src_npymath_npy__math__private.h) = e3b8e751fd0b6b6c6794d714aa5f60dfe9d7f421
 SHA1 (patch-numpy_distutils_command_config.py) = eb37d28482689703e0c1a264f9768409cf8bb4b6

Index: pkgsrc/math/py-numpy/patches/patch-numpy_core_include_numpy_npy__common.h
diff -u pkgsrc/math/py-numpy/patches/patch-numpy_core_include_numpy_npy__common.h:1.1 pkgsrc/math/py-numpy/patches/patch-numpy_core_include_numpy_npy__common.h:1.2
--- pkgsrc/math/py-numpy/patches/patch-numpy_core_include_numpy_npy__common.h:1.1       Wed May 25 19:09:25 2022
+++ pkgsrc/math/py-numpy/patches/patch-numpy_core_include_numpy_npy__common.h   Wed May 25 19:22:20 2022
@@ -1,4 +1,4 @@
-$NetBSD: patch-numpy_core_include_numpy_npy__common.h,v 1.1 2022/05/25 19:09:25 tnn Exp $
+$NetBSD: patch-numpy_core_include_numpy_npy__common.h,v 1.2 2022/05/25 19:22:20 tnn Exp $
 
 Fix build on non-x86:
 The configure test for __builtin_prefetch is broken with clang.
@@ -11,7 +11,7 @@ _configtest.c:6:3: error: builtin functi
  #endif
  
 -#ifdef HAVE___BUILTIN_PREFETCH
-+#if !defined(__i386__) && !defined(__x86_64__)
++#if 1
  /* unlike _mm_prefetch also works on non-x86 */
  #define NPY_PREFETCH(x, rw, loc) __builtin_prefetch((x), (rw), (loc))
  #else