pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/math/py-numpy py-numpy: fix build on NetBSD



details:   https://anonhg.NetBSD.org/pkgsrc/rev/c50206aad43a
branches:  trunk
changeset: 376621:c50206aad43a
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Sun Apr 10 13:15:47 2022 +0000

description:
py-numpy: fix build on NetBSD

diffstat:

 math/py-numpy/distinfo                                                  |   3 +-
 math/py-numpy/patches/patch-numpy_core_src_npymath_npy__math__private.h |  29 ++++++++++
 2 files changed, 31 insertions(+), 1 deletions(-)

diffs (48 lines):

diff -r 4bc65c3beee1 -r c50206aad43a math/py-numpy/distinfo
--- a/math/py-numpy/distinfo    Sun Apr 10 12:52:26 2022 +0000
+++ b/math/py-numpy/distinfo    Sun Apr 10 13:15:47 2022 +0000
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.69 2022/04/09 12:14:27 adam Exp $
+$NetBSD: distinfo,v 1.70 2022/04/10 13:15:47 tnn Exp $
 
 BLAKE2s (numpy-1.22.3.zip) = 8add725a5f6a438218d1df65e832acf84264fcdf59eaf006b5f80c4b492f0905
 SHA512 (numpy-1.22.3.zip) = fdeefd0ffad798a078376fe16ad840551309d3bbf551eca09d92a35048ee75c3739ab0becedb23448d82999da148827e69ded8842201c3dda72b46b4eb9be93f
 Size (numpy-1.22.3.zip) = 11451867 bytes
 SHA1 (patch-numpy_core_setup.py) = 70db6193da36d31a085036e2b61b154e990f70de
+SHA1 (patch-numpy_core_src_npymath_npy__math__private.h) = e3b8e751fd0b6b6c6794d714aa5f60dfe9d7f421
 SHA1 (patch-numpy_distutils_fcompiler_____init____.py) = 49d070da5b48bd9818b37ac3254341fa68503c53
 SHA1 (patch-numpy_distutils_fcompiler_g95.py) = be73b64a3e551df998b6a904d6db762bf28a98ed
 SHA1 (patch-numpy_distutils_fcompiler_gnu.py) = 1ab3fd7b3f42328f4094f1b21a65c05ae4d975b7
diff -r 4bc65c3beee1 -r c50206aad43a math/py-numpy/patches/patch-numpy_core_src_npymath_npy__math__private.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/math/py-numpy/patches/patch-numpy_core_src_npymath_npy__math__private.h   Sun Apr 10 13:15:47 2022 +0000
@@ -0,0 +1,29 @@
+$NetBSD: patch-numpy_core_src_npymath_npy__math__private.h,v 1.1 2022/04/10 13:15:47 tnn Exp $
+
+don't include <complex.h> (C99 complex) when compiling C++.
+It breaks due to conflict with std::complex.
+
+INFO: c++: numpy/core/src/umath/clip.cpp
+In file included from numpy/core/src/npymath/npy_math_private.h:176,
+                 from numpy/core/src/npymath/npy_math_internal.h.src:56,
+                 from numpy/core/include/numpy/npy_math.h:596,
+                 from numpy/core/include/numpy/halffloat.h:5,
+                 from numpy/core/src/umath/clip.cpp:11:
+numpy/core/src/npymath/npy_math_private.h:517:14: error: expected unqualified-id before '_Complex'
+  517 |         std::complex<double> c99z;
+
+--- numpy/core/src/npymath/npy_math_private.h.orig     2022-02-22 11:30:42.000000000 +0000
++++ numpy/core/src/npymath/npy_math_private.h
+@@ -173,8 +173,12 @@ do {                                    
+ } while (0)
+ 
+ #ifdef NPY_USE_C99_COMPLEX
++#ifdef __cplusplus
++#include <complex>
++#else
+ #include <complex.h>
+ #endif
++#endif
+ 
+ /*
+  * Long double support



Home | Main Index | Thread Index | Old Index