| Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame^] | 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> |