diff options
| author | tnn <tnn@pkgsrc.org> | 2022-05-26 14:49:59 +0000 |
|---|---|---|
| committer | tnn <tnn@pkgsrc.org> | 2022-05-26 14:49:59 +0000 |
| commit | 29bfa1e8da2c01b30d703c9de1789257c89b1fed (patch) | |
| tree | 4f13de860851a54738ce0a628c306786e6e371ed /math/py-scipy | |
| parent | 4cfc18f85164af674efa133f4e10c33a1986d289 (diff) | |
| download | pkgsrc-29bfa1e8da2c01b30d703c9de1789257c89b1fed.tar.gz | |
py-scipy: disable __builtin_prefetch with clang
Diffstat (limited to 'math/py-scipy')
| -rw-r--r-- | math/py-scipy/distinfo | 3 | ||||
| -rw-r--r-- | math/py-scipy/patches/patch-scipy_spatial_ckdtree_src_ckdtree__decl.h | 19 |
2 files changed, 21 insertions, 1 deletions
diff --git a/math/py-scipy/distinfo b/math/py-scipy/distinfo index 34d8e38613b..a96951bb027 100644 --- a/math/py-scipy/distinfo +++ b/math/py-scipy/distinfo @@ -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 --git a/math/py-scipy/patches/patch-scipy_spatial_ckdtree_src_ckdtree__decl.h b/math/py-scipy/patches/patch-scipy_spatial_ckdtree_src_ckdtree__decl.h new file mode 100644 index 00000000000..4a36065be93 --- /dev/null +++ b/math/py-scipy/patches/patch-scipy_spatial_ckdtree_src_ckdtree__decl.h @@ -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) |