diff options
| author | tnn <tnn@pkgsrc.org> | 2022-05-27 16:59:50 +0000 |
|---|---|---|
| committer | tnn <tnn@pkgsrc.org> | 2022-05-27 16:59:50 +0000 |
| commit | e23310cea2870a08f673e1575c3258392a29cad7 (patch) | |
| tree | c8317dd9fa380f6c4b5b391ed10dc22a5bac6536 /math/py-scipy | |
| parent | 125154b78554a78280dedc9db435ac90f67973da (diff) | |
| download | pkgsrc-e23310cea2870a08f673e1575c3258392a29cad7.tar.gz | |
py-scipy: disable __builtin_prefetch completely for now
It failed with GCC too. There is some bad interaction with py-numpy,
probably related to patch-numpy_core_include_numpy_npy__common.h.
Unbreak the build until I have time to investigate this.
Diffstat (limited to 'math/py-scipy')
| -rw-r--r-- | math/py-scipy/Makefile | 3 | ||||
| -rw-r--r-- | math/py-scipy/distinfo | 4 | ||||
| -rw-r--r-- | math/py-scipy/patches/patch-scipy_spatial_ckdtree_src_ckdtree__decl.h | 6 |
3 files changed, 7 insertions, 6 deletions
diff --git a/math/py-scipy/Makefile b/math/py-scipy/Makefile index 8fa2732d821..9997a7b736e 100644 --- a/math/py-scipy/Makefile +++ b/math/py-scipy/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.57 2022/05/20 12:09:01 adam Exp $ +# $NetBSD: Makefile,v 1.58 2022/05/27 16:59:50 tnn Exp $ DISTNAME= scipy-1.8.1 +PKGREVISION= 1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} CATEGORIES= math python MASTER_SITES= ${MASTER_SITE_PYPI:=s/scipy/} diff --git a/math/py-scipy/distinfo b/math/py-scipy/distinfo index a96951bb027..558b62541fb 100644 --- a/math/py-scipy/distinfo +++ b/math/py-scipy/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.35 2022/05/26 14:49:59 tnn Exp $ +$NetBSD: distinfo,v 1.36 2022/05/27 16:59:50 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_spatial_ckdtree_src_ckdtree__decl.h) = ad0e4a79af2a3b0667e61f205f5b8453ea440498 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 index 4a36065be93..aa45cdce439 100644 --- 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 @@ -1,15 +1,15 @@ -$NetBSD: patch-scipy_spatial_ckdtree_src_ckdtree__decl.h,v 1.1 2022/05/26 14:49:59 tnn Exp $ +$NetBSD: patch-scipy_spatial_ckdtree_src_ckdtree__decl.h,v 1.2 2022/05/27 16:59:50 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.orig 2022-04-29 21:14:38.041529700 +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__) ++#if 0 #define CKDTREE_PREFETCH(x, rw, loc) NPY_PREFETCH(x, rw, loc) +#else +#define CKDTREE_PREFETCH(x, rw, loc) |