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

Don't build flock on Solaris #2082

Merged
merged 1 commit into from
Aug 7, 2023
Merged

Don't build flock on Solaris #2082

merged 1 commit into from
Aug 7, 2023

Conversation

inferiorhumanorgans
Copy link

Solaris hasn't included flock(2) for a long while now, and building this wrapper creates issues with undefined symbols. However, OpenSolaris derivatives like Illumos do include flock(2) so they should not be excluded here.

@asomers
Copy link
Member

asomers commented Aug 6, 2023

This sounds reasonable, but could you please add a note to CHANGELOG? You'll also have to rebase to fix CI.

CHANGELOG.md Outdated Show resolved Hide resolved
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 6, 2023

Merge conflict.

Solaris hasn't included flock(2) for a long while now, and building
this wrapper creates issues with undefined symbols.  However,
OpenSolaris derivatives like Illumos do include flock(2) so they should
not be excluded here.
@asomers asomers added this pull request to the merge queue Aug 7, 2023
Merged via the queue into nix-rust:master with commit 783e38d Aug 7, 2023
39 checks passed
@inferiorhumanorgans inferiorhumanorgans deleted the solaris-no-flock branch August 7, 2023 11:47
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