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

ancillary fix dragonfly build #91955

Closed
wants to merge 1 commit into from
Closed

ancillary fix dragonfly build #91955

wants to merge 1 commit into from

Conversation

devnexen
Copy link
Contributor

No description provided.

@rust-highfive
Copy link
Collaborator

r? @dtolnay

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 15, 2021
@dtolnay
Copy link
Member

dtolnay commented Dec 15, 2021

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Dec 15, 2021

📌 Commit dc5f2f048c2c82be9fe9fd446ed78efe2952d53e has been approved by dtolnay

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 15, 2021
@rtzoeller
Copy link
Contributor

@devnexen it doesn't look like this fixes all of the compilation errors introduced by #91553. library/std/src/sys/unix/net.rs was modified and libc::SO_PASSCRED is now used, but rust-lang/libc doesn't provide a definition of SO_PASSCRED for DragonFly (although DragonFly does define it).

@devnexen
Copy link
Contributor Author

@dtolnay can we use the last commit instead please ? :-) thanks in advance.

@dtolnay
Copy link
Member

dtolnay commented Dec 15, 2021

@bors r+

@bors
Copy link
Contributor

bors commented Dec 15, 2021

📌 Commit 8cc2222 has been approved by dtolnay

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Dec 15, 2021
@matthiaskrgr
Rollup merge of rust-lang#91955 - devnexen:dfly_build_fix, r=dtolnay
f9bcac4 
ancillary fix dragonfly build
@matthiaskrgr matthiaskrgr mentioned this pull request Dec 15, 2021
Closed
rtzoeller
rtzoeller reviewed Dec 15, 2021
View reviewed changes
library/std/src/os/unix/net/ancillary.rs Outdated
@@ -249,46 +249,46 @@ impl SocketCred {
#[unstable(feature = "unix_socket_ancillary_data", issue = "76915")]
#[must_use]
pub fn new() -> SocketCred {
SocketCred(libc::cmsgcred { cmsgcred_pid: 0, cmsgcred_uid: 0, cmsgcred_gid: 0 })
SocketCred(libc::cmsgcred { cmcred_pid: 0, cmcred_uid: 0, cmcred_gid: 0 })
Copy link
Contributor

@rtzoeller rtzoeller Dec 15, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

This still appears wrong to me. DragonFly defines additional members in cmsgcred which aren't being referenced here, leading to E0063 when I build this locally. https://github.com/rust-lang/libc/blob/9b054d8779d2f71f1803e20f0e3b3327a4ae2764/src/unix/bsd/freebsdlike/mod.rs#L214-L221

@devnexen are you building these changes locally? My understanding is with DragonFly being a Tier 3 target, this code isn't actually built or tested in PR or CI builds, meaning you can't rely on bors to validate your changes.

I can walk you through building this locally if needed, but I'm concerned that neither this PR nor e68887e were ever actually tested...

Copy link
Contributor Author

Choose a reason for hiding this comment

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

is that the only build error ?

Copy link
Contributor

Choose a reason for hiding this comment

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

It is the only error which is not originating as a warning.

Are you set up to build this locally to test your changes?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

is it building for you ? unfortunately I lost my DragonFly VM so I can t test for now.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

sorry for the disturbance, for now better to revert at least that will unblock your situation.

@devnexen devnexen closed this Dec 17, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rtzoeller rtzoeller rtzoeller left review comments

@dtolnay dtolnay dtolnay approved these changes

Assignees

@dtolnay dtolnay

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@devnexen @rust-highfive @dtolnay @bors @rtzoeller