summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-devtools/python-numpy/files/add-glibc-check.patch36
1 files changed, 0 insertions, 36 deletions
diff --git a/meta/recipes-devtools/python-numpy/files/add-glibc-check.patch b/meta/recipes-devtools/python-numpy/files/add-glibc-check.patch
deleted file mode 100644
index 29768f34d2..0000000000
--- a/meta/recipes-devtools/python-numpy/files/add-glibc-check.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1Dont punish musl for glibc's trignometeric functions problems
2additionally ensure that glibc specific macros are not used
3unconditionally
4
5Signed-off-by: Khem Raj <raj.khem@gmail.com>
6Upstream-Status: Pending
7Index: 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
24Index: 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>