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

Add EV_DISPATCH, EV_RECEIPT items for EventFlags, and fix build on OpenBSD #1252

Merged
merged 4 commits into from May 31, 2020

Conversation

nickpelone
Copy link
Contributor

@nickpelone nickpelone commented May 26, 2020

This pull request:

  • Adds EV_DISPATCH and EV_RECEIPT to EventFlags. OpenBSD supports these now.
    c379d1a
  • Fixes a regression that caused nix to be unable to build on OpenBSD since Support sendmmsg/recvmmsg #1208.
    dd0a990
  • Makes a change to avoid a deprecation warning from libc crate, which breaks tests.
    0f9fcbd

Since I know y'all don't have OpenBSD in CI right now, I've attached the results of a cargo test run on OpenBSD 6.7.

Thanks for your time!

testresults.txt

Fixes #1251

… for sendmmsg() / recvmmsg() in nix-rust#1208.

In nix-rust#1208, sendmmsg() / recvmmsg() were added, but OpenBSD(who doesn't support these)
was included on the list of allowed operating systems for sendmmsg() related things.
This broke the build on OpenBSD.

For more Rust-world examples, see: rust-lang/libc@6f62973
…cessfully. This type was deprecated in libc 0.2.55.
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.

LGTM!

bors r+

bors bot added a commit that referenced this pull request May 31, 2020
1252: Add EV_DISPATCH, EV_RECEIPT items for EventFlags, and fix build on OpenBSD r=asomers a=nickpelone

This pull request:

- Adds `EV_DISPATCH` and `EV_RECEIPT` to `EventFlags`. OpenBSD supports these now. 
c379d1a
- Fixes a regression that caused `nix` to be unable to build on OpenBSD since #1208. 
dd0a990
- Makes a change to avoid a deprecation warning from `libc` crate, which breaks tests. 
0f9fcbd

Since I know y'all don't have OpenBSD in CI right now, I've attached the results of a `cargo test` run on OpenBSD 6.7.

Thanks for your time!

[testresults.txt](https://github.com/nix-rust/nix/files/4684597/testresults.txt)

Fixes #1251 

Co-authored-by: Nick Pelone <nick.pelone@calyptix.com>
@bors
Copy link
Contributor

bors bot commented May 31, 2020

Build failed:

@asomers
Copy link
Member

asomers commented May 31, 2020

Build failed due to a timeout for a Tier 3 platform (Redox).

bors retry

@bors
Copy link
Contributor

bors bot commented May 31, 2020

Build succeeded:

@bors bors bot merged commit 84e66d7 into nix-rust:master May 31, 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.

Missing EventFlag bitflags on OpenBSD (EV_DISPATCH, EV_RECEIPT)
2 participants