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.

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

Add OpenBSD CLOCK_* constants #3146

Merged
merged 1 commit into from
Mar 15, 2023
Merged

Add OpenBSD CLOCK_* constants #3146

merged 1 commit into from
Mar 15, 2023

Conversation

lcheylus
Copy link
Contributor

To compile wasmer-wasi crate (part of Wasmer) on OpenBSD, I need to add CLOCK_* constants from /usr/include/sys_time.h file.

  • Add CLOCK_* constants in src/unix/bsd/netbsdlike/openbsd/mod.rs
  • Update libc-test/semver/openbsd.txt accordingly

cc @semarie

@rustbot
Copy link
Collaborator

rustbot commented Mar 11, 2023

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @JohnTitor (or someone else) soon.

Please see the contribution instructions for more information. Namely, in order to ensure the minimum review times lag, PR authors and assigned reviewers should ensure that the review label (S-waiting-on-review and S-waiting-on-author) stays updated, invoking these commands when appropriate:

  • @rustbot author: the review is finished, PR author should check the comments and take action accordingly
  • @rustbot review: the author is ready for a review, this PR will be queued again in the reviewer's queue

@rustbot
Copy link
Collaborator

rustbot commented Mar 11, 2023

Some changes occurred in OpenBSD module

cc @semarie

@semarie
Copy link
Contributor

semarie commented Mar 11, 2023

both CLOCK_REALTIME and CLOCK_MONOTONIC are already defined (inside netbsdlike/mod.rs), so the test failed.

without them (from openbsd/mod.rs and from semver/openbsd.txt), it would be fine.

semarie
semarie approved these changes Mar 11, 2023
View reviewed changes
Copy link
Contributor

@semarie semarie left a comment

Choose a reason for hiding this comment

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

LGTM

@JohnTitor
Copy link
Member

Could you squash commits into one?

@lcheylus
Copy link
Contributor Author

Could you squash commits into one?

Done

@JohnTitor
Copy link
Member

It doesn't seem to be squashed, see this guide on how you can "squash" commits into one if you're unfamiliar with Git.
Also, I'd prefer the "no merge" policy here.

@lcheylus
Add OpenBSD CLOCK_* constants
e71a4c0 
  - src/unix/bsd/netbsdlike/openbsd/mod.rs: add CLOCK_* constants from
    /usr/include/sys/_time.h
  - libc-test/semver/openbsd.txt: update file for new constants CLOCK_*

Signed-off-by: Laurent Cheylus <foxy@free.fr>
@lcheylus
Copy link
Contributor Author

It doesn't seem to be squashed, see this guide on how you can "squash" commits into one if you're unfamiliar with Git. Also, I'd prefer the "no merge" policy here.

OK, fix my commit and remove merge to comply with the "no merge" policy.

@JohnTitor
Copy link
Member

Thanks a lot! @bors r+

@bors
Copy link
Contributor

bors commented Mar 13, 2023

📌 Commit e71a4c0 has been approved by JohnTitor

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Mar 13, 2023

⌛ Testing commit e71a4c0 with merge c7b1d50...

bors added a commit that referenced this pull request Mar 13, 2023
@bors
Auto merge of #3146 - lcheylus:openbsd, r=JohnTitor
c7b1d50 
Add OpenBSD CLOCK_* constants

To compile [`wasmer-wasi`](https://github.com/wasmerio/wasmer/tree/master/lib/wasi) crate (part of Wasmer) on OpenBSD, I need to add CLOCK_* constants from `/usr/include/sys_time.h` file.

- Add CLOCK_* constants in `src/unix/bsd/netbsdlike/openbsd/mod.rs`
- Update `libc-test/semver/openbsd.txt` accordingly

cc `@semarie`
@bors
Copy link
Contributor

bors commented Mar 13, 2023

💔 Test failed - checks-actions

@semarie
Copy link
Contributor

semarie commented Mar 13, 2023

homu failed due to network error:

error: could not download file from 'https://static.rust-lang.org/dist/channel-rust-beta.toml.sha256' to '/home/runner/.rustup/tmp/1opbiuinxdcnt9l5_file': failed to make network request: error sending request for url (https://static.rust-lang.org/dist/channel-rust-beta.toml.sha256): error trying to connect: Connection reset by peer (os error 104): error trying to connect: Connection reset by peer (os error 104): Connection reset by peer (os error 104): Connection reset by peer (os error 104)

@JohnTitor
Copy link
Member

@bors retry

@bors
Copy link
Contributor

bors commented Mar 15, 2023

⌛ Testing commit e71a4c0 with merge 3dba004...

bors added a commit that referenced this pull request Mar 15, 2023
@bors
Auto merge of #3146 - lcheylus:openbsd, r=JohnTitor
3dba004 
Add OpenBSD CLOCK_* constants

To compile [`wasmer-wasi`](https://github.com/wasmerio/wasmer/tree/master/lib/wasi) crate (part of Wasmer) on OpenBSD, I need to add CLOCK_* constants from `/usr/include/sys_time.h` file.

- Add CLOCK_* constants in `src/unix/bsd/netbsdlike/openbsd/mod.rs`
- Update `libc-test/semver/openbsd.txt` accordingly

cc `@semarie`
@bors
Copy link
Contributor

bors commented Mar 15, 2023

💔 Test failed - checks-actions

@JohnTitor
Copy link
Member

Another network failure, @bors retry

@bors
Copy link
Contributor

bors commented Mar 15, 2023

⌛ Testing commit e71a4c0 with merge bac1442...

@bors
Copy link
Contributor

bors commented Mar 15, 2023

☀️ Test successful - checks-actions, checks-cirrus-freebsd-12, checks-cirrus-freebsd-13, checks-cirrus-freebsd-14
Approved by: JohnTitor
Pushing bac1442 to master...

@bors bors merged commit bac1442 into rust-lang:master Mar 15, 2023
@lcheylus lcheylus deleted the openbsd branch March 15, 2023 17:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@semarie semarie semarie approved these changes

@JohnTitor JohnTitor JohnTitor approved these changes

Assignees

@JohnTitor JohnTitor

Labels
S-waiting-on-bors
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@lcheylus @rustbot @semarie @JohnTitor @bors