10000 BLD: fix compilation on non glibc-Linuxes by xdmiodz · Pull Request #7087 · numpy/numpy · GitHub
[go: up one dir, main page]
Skip to content

BLD: fix compilation on non glibc-Linuxes #7087

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 21, 2016
Merged

BLD: fix compilation on non glibc-Linuxes #7087

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
BLD: fix compilation on non glibc-Linuxes 
Non-glibc Linuxes dont have the __GLIBC_PREREQ function and compilation of numpy
fails on such platforms. To avoid this the TRIG_OK check should be done only in
the glibc environment

The patch is taken from AlpineLinux repository
http://git.alpinelinux.org/cgit/aports/tree/testing/py-numpy/numpy-1.10.0-musl.patch?id=2e5c4bfcf1c9746edd58a8e684d01403f234e71d
  • Loading branch information
@xdmiodz
xdmiodz committed Jan 21, 2016
commit 8c84718365c073fb5ea84e7d3c05fa72bc5c5698
6 changes: 3 additions & 3 deletions numpy/core/src/private/npy_config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@
#endif /* defined(_MSC_VER) && defined(__INTEL_COMPILER) */


/* Disable broken gnu trig functions on linux */
#if defined(__linux__) && defined(__GNUC__)
/* Disable broken glibc trig functions on linux */
#if defined(__linux__) && defined(__GLIBC__)

#if defined(HAVE_FEATURES_H)
#include <features.h>
Expand Down Expand Up @@ -102,6 +102,6 @@
#endif
#undef TRIG_OK

#endif /* defined(__linux__) && defined(__GNUC__) */
#endif /* defined(__linux__) && defined(__GLIBC__) */

#endif
0