[pkgsrc/trunk]: pkgsrc/math/py-scipy py-scipy: disable __builtin_prefetch wit...

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9deefa6d83a6
branches:  trunk
changeset: 379977:9deefa6d83a6
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Thu May 26 14:49:59 2022 +0000

description:
py-scipy: disable __builtin_prefetch with clang

diffstat:

 math/py-scipy/distinfo                                                |   3 +-
 math/py-scipy/patches/patch-scipy_spatial_ckdtree_src_ckdtree__decl.h |  19 ++++++++++
 2 files changed, 21 insertions(+), 1 deletions(-)

diffs (36 lines):

diff -r 4b5f558f000d -r 9deefa6d83a6 math/py-scipy/distinfo
--- a/math/py-scipy/distinfo    Thu May 26 11:09:54 2022 +0000
+++ b/math/py-scipy/distinfo    Thu May 26 14:49:59 2022 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.34 2022/05/20 12:09:01 adam Exp $
+$NetBSD: distinfo,v 1.35 2022/05/26 14:49:59 tnn Exp $
 
 BLAKE2s (scipy-1.8.1.tar.gz) = 364d6645a49d897429094a406e6073e124c1ebca01f4be63ebe401b660d8df38
 SHA512 (scipy-1.8.1.tar.gz) = f6fc71c209991fe82baa4b10d8ade0deb1057f6f5942a91dfb7ae45f3eb78a4535efa2861badf5e2d37239fa99dbd99de760aa7e4854b95991ade0263004e7ea
 Size (scipy-1.8.1.tar.gz) = 38196215 bytes
+SHA1 (patch-scipy_spatial_ckdtree_src_ckdtree__decl.h) = bc97245b7e0b2ae0e81d7aa2ac90c6a209af5dd1
 SHA1 (patch-scipy_special___logit.h) = c729c2b73de00cad4c9ad834a79b80dea7b05af3
 SHA1 (patch-scipy_special___round.h) = bc05a935e6423ce8395450ad3b30e88826939422
diff -r 4b5f558f000d -r 9deefa6d83a6 math/py-scipy/patches/patch-scipy_spatial_ckdtree_src_ckdtree__decl.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/math/py-scipy/patches/patch-scipy_spatial_ckdtree_src_ckdtree__decl.h     Thu May 26 14:49:59 2022 +0000
@@ -0,0 +1,19 @@
+$NetBSD: patch-scipy_spatial_ckdtree_src_ckdtree__decl.h,v 1.1 2022/05/26 14:49:59 tnn Exp $
+
+Many errors like this:
+scipy/spatial/ckdtree/src/query_pairs.cxx:110:16: error: argument to '__builtin_prefetch' must be a constant integer
+
+--- scipy/spatial/ckdtree/src/ckdtree_decl.h.orig      2022-04-29 21:14:38.000000000 +0000
++++ scipy/spatial/ckdtree/src/ckdtree_decl.h
+@@ -10,7 +10,11 @@
+ #include <numpy/npy_common.h>
+ #define CKDTREE_LIKELY(x) NPY_LIKELY(x)
+ #define CKDTREE_UNLIKELY(x)  NPY_UNLIKELY(x)
++#if !defined(__clang__)
+ #define CKDTREE_PREFETCH(x, rw, loc)  NPY_PREFETCH(x, rw, loc)
++#else
++#define CKDTREE_PREFETCH(x, rw, loc)
++#endif
+ 
+ #define ckdtree_intp_t npy_intp
+ #define ckdtree_isinf(x)   sc_isinf(x)