diff options
author | Khem Raj <raj.khem@gmail.com> | 2016-03-17 05:18:21 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-20 23:12:27 +0000 |
commit | 0d9f515e1eca0564503fddcaa337fecfd45b368e (patch) | |
tree | dc2ae66ce609abc1ff71bbd84f8ff1000fddd454 /meta/recipes-devtools/python/python-numpy/add-glibc-check.patch | |
parent | e1f3f4cc3c2468cd8972a5fdf7ff7397edfead7a (diff) | |
download | poky-0d9f515e1eca0564503fddcaa337fecfd45b368e.tar.gz |
python-numpy: Fix build on musl
Match API version in cached _numpyconfig.h to the
one mandated by numpy version in use.
(From OE-Core rev: 7a0ba5cbb1ea0a379c1e61fb58d7595e8f8480c4)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/python/python-numpy/add-glibc-check.patch')
-rw-r--r-- | meta/recipes-devtools/python/python-numpy/add-glibc-check.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/meta/recipes-devtools/python/python-numpy/add-glibc-check.patch b/meta/recipes-devtools/python/python-numpy/add-glibc-check.patch new file mode 100644 index 0000000000..29768f34d2 --- /dev/null +++ b/meta/recipes-devtools/python/python-numpy/add-glibc-check.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | Dont punish musl for glibc's trignometeric functions problems | ||
2 | additionally ensure that glibc specific macros are not used | ||
3 | unconditionally | ||
4 | |||
5 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
6 | Upstream-Status: Pending | ||
7 | Index: numpy-1.10.4/numpy/core/src/private/npy_config.h | ||
8 | =================================================================== | ||
9 | --- numpy-1.10.4.orig/numpy/core/src/private/npy_config.h | ||
10 | +++ numpy-1.10.4/numpy/core/src/private/npy_config.h | ||
11 | @@ -75,10 +75,12 @@ | ||
12 | |||
13 | #if defined(HAVE_FEATURES_H) | ||
14 | #include <features.h> | ||
15 | +#ifdef __GLIBC__ | ||
16 | #define TRIG_OK __GLIBC_PREREQ(2, 16) | ||
17 | #else | ||
18 | #define TRIG_OK 0 | ||
19 | #endif | ||
20 | +#endif | ||
21 | |||
22 | #if !TRIG_OK | ||
23 | #undef HAVE_CASIN | ||
24 | Index: numpy-1.10.4/numpy/core/src/npymath/ieee754.c.src | ||
25 | =================================================================== | ||
26 | --- numpy-1.10.4.orig/numpy/core/src/npymath/ieee754.c.src | ||
27 | +++ numpy-1.10.4/numpy/core/src/npymath/ieee754.c.src | ||
28 | @@ -612,7 +612,7 @@ void npy_set_floatstatus_invalid(void) | ||
29 | } | ||
30 | |||
31 | |||
32 | -#elif defined(__GLIBC__) || defined(__APPLE__) || \ | ||
33 | +#elif defined(__linux__) || defined(__APPLE__) || \ | ||
34 | defined(__CYGWIN__) || defined(__MINGW32__) || \ | ||
35 | (defined(__FreeBSD__) && (__FreeBSD_version >= 502114)) | ||
36 | # include <fenv.h> | ||