mirror of
https://git.yoctoproject.org/git/poky
synced 2026-01-01 13:58:04 +00:00
0d9f515e1e
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>
37 lines
1.2 KiB
Diff
37 lines
1.2 KiB
Diff
Dont punish musl for glibc's trignometeric functions problems
|
|
additionally ensure that glibc specific macros are not used
|
|
unconditionally
|
|
|
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
Upstream-Status: Pending
|
|
Index: numpy-1.10.4/numpy/core/src/private/npy_config.h
|
|
===================================================================
|
|
--- numpy-1.10.4.orig/numpy/core/src/private/npy_config.h
|
|
+++ numpy-1.10.4/numpy/core/src/private/npy_config.h
|
|
@@ -75,10 +75,12 @@
|
|
|
|
#if defined(HAVE_FEATURES_H)
|
|
#include <features.h>
|
|
+#ifdef __GLIBC__
|
|
#define TRIG_OK __GLIBC_PREREQ(2, 16)
|
|
#else
|
|
#define TRIG_OK 0
|
|
#endif
|
|
+#endif
|
|
|
|
#if !TRIG_OK
|
|
#undef HAVE_CASIN
|
|
Index: numpy-1.10.4/numpy/core/src/npymath/ieee754.c.src
|
|
===================================================================
|
|
--- numpy-1.10.4.orig/numpy/core/src/npymath/ieee754.c.src
|
|
+++ numpy-1.10.4/numpy/core/src/npymath/ieee754.c.src
|
|
@@ -612,7 +612,7 @@ void npy_set_floatstatus_invalid(void)
|
|
}
|
|
|
|
|
|
-#elif defined(__GLIBC__) || defined(__APPLE__) || \
|
|
+#elif defined(__linux__) || defined(__APPLE__) || \
|
|
defined(__CYGWIN__) || defined(__MINGW32__) || \
|
|
(defined(__FreeBSD__) && (__FreeBSD_version >= 502114))
|
|
# include <fenv.h>
|