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

BLD: fix compilation on non glibc-Linuxes #7092

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

Jump to bottom
Merged
merged 1 commit into from
Jan 22, 2016
Merged

BLD: fix compilation on non glibc-Linuxes #7092

merged 1 commit into from
Jan 22, 2016

Conversation

xdmiodz
Copy link
Contributor
@xdmiodz xdmiodz commented Jan 21, 2016

Non-glibc Linuxes dont have the __GLIBC_PREREQ function and compilation of numpy
fails on such platforms.

@charris
Copy link
Member
charris commented Jan 21, 2016
8000

Ha, exactly the fix I was about to upload, right down to the blank lines. Well, almost, I just checked for __GLIBC__ instead of __GLIBC_PREREQ. Anyway, looks good to me.

charris
charris reviewed Jan 21, 2016
View reviewed changes
numpy/core/src/private/npy_config.h
#endif /* __GLIBC_PREREQ(2, 16) */
#endif /* defined(__GLIBC_PREREQ) */

#endif /* defined(HAVE_FEATURES_H) */

#endif /* defined(__linux__) && defined(__GNUC__) */
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should go away, and the initial #if also.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because we really don't care about linux and the compiler, just glibc. I checked for linux originally because I didn't know what would happen with mingw.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So forget comments above.

@charris
Copy link
Member
charris commented Jan 21, 2016

Hmm, lots of failing tests. Apparently features.h is not available in the non-debug test environment. Previously, the default in that case was to #define TRIG_OK 0, so we might want to keep that default. Optionally, we could figure out why features.h is missing.

@xdmiodz
BLD: fix compilation on non glibc-Linuxes
f189e2a 
Non-glibc Linuxes dont have the __GLIBC_PREREQ function and compilation of numpy
fails on such platforms.
@xdmiodz
Copy link
Contributor Author
xdmiodz commented Jan 21, 2016

It's just because I inverted the condition on glibc version. It's good to have tests )

@charris charris added this to the 1.11.0 release milestone Jan 22, 2016
charris added a commit that referenced this pull request Jan 22, 2016
@charris
Merge pull request #7092 from xdmiodz/glibc-check
d5cef01 
BLD: fix compilation on non glibc-Linuxes
@charris charris merged commit d5cef01 into numpy:master Jan 22, 2016
@charris
Copy link
Member
charris commented Jan 22, 2016

Thanks @xdmiodz .

charris added a commit that referenced this pull request Jan 22, 2016
@charris
Merge pull request #7095 from charris/backport-7092
4388378 
Backport #7092, BLD: fix compilation on non glibc-Linuxes
@charris charris removed this from the 1.11.0 release milestone Jan 23, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
00 - Bug component: build
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@xdmiodz @charris
0