Skip to content
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.

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

Expose SeekData and SeekHole on all Linux targets #1284

Merged
merged 3 commits into from
Aug 22, 2020

Conversation

Amanieu
Copy link
Contributor

@Amanieu Amanieu commented Aug 5, 2020

These were previously missing on musl and mips targets because of
missing definitions in the libc crate.

Copy link
Member

@asomers asomers left a comment

Choose a reason for hiding this comment

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

Nix should never define symbols like this. Instead, please submit a PR to libc.

@Amanieu
Copy link
Contributor Author

Amanieu commented Aug 18, 2020

Musl doesn't define these constants in its headers, which is why they are not defined by the libc crate. See rust-lang/libc#319.

@asomers
Copy link
Member

asomers commented Aug 22, 2020

Yes it does. At least, they're in the libc crate now. And if they weren't, then it still wouldn't be right for Nix to define them.

@Amanieu
Copy link
Contributor Author

Amanieu commented Aug 22, 2020

I had an old checkout of libc and didn't notice that SEEK_DATA and SEEK_HOLE had already been added. I've updated the PR to use the libc definitions.

@asomers
Copy link
Member

asomers commented Aug 22, 2020

Looks good now! Could you also please add a CHANGELOG entry?

These were previously missing on musl and mips targets because of
missing definitions in the libc crate.
@Amanieu Amanieu changed the title Expose SeekData and SeedHole on all Linux targets Expose SeekData and SeekHole on all Linux targets Aug 22, 2020
@Amanieu
Copy link
Contributor Author

Amanieu commented Aug 22, 2020

Done.

Copy link
Member

@asomers asomers left a comment

Choose a reason for hiding this comment

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

bors r+

@bors
Copy link
Contributor

bors bot commented Aug 22, 2020

Merge conflict.

Copy link
Member

@asomers asomers left a comment

Choose a reason for hiding this comment

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

bors r+

@bors
Copy link
Contributor

bors bot commented Aug 22, 2020

Build succeeded:

@bors bors bot merged commit 645309d into nix-rust:master Aug 22, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants