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 MSG_WAITFORONE.try_into().unwrap() to deal with different type signature on musl libc #29369

Merged
merged 6 commits into from
Jan 25, 2023

Conversation

billythedummy
Copy link
Contributor

Problem

Related: #28156 , rust-lang/libc#2945

As mentioned in the related issues, due to musl changing the type signature of recvmmsg, solana-streamer cannot compile for target x86_64-unknown-linux-musl.

Summary of Changes

Adding a try_into().unwrap() allows rustc to infer the arg type so that it works for both glibc and musl.

Note that libc is in the process of making a breaking change for this, starting with deprecating the flags: rust-lang/libc#2963 . This change should just serve as a temporary workaround until that change lands.

Fixes #28156

@mergify mergify bot added the community Community contribution label Dec 22, 2022
@mergify mergify bot requested a review from a team December 22, 2022 10:28
@TheAwiteb
Copy link

Why hasn't it been merged yet? See it's clear

@mvines mvines added the CI Pull Request is ready to enter CI label Jan 7, 2023
@solana-grimes solana-grimes removed the CI Pull Request is ready to enter CI label Jan 7, 2023
@mvines mvines added the CI Pull Request is ready to enter CI label Jan 10, 2023
@solana-grimes solana-grimes removed the CI Pull Request is ready to enter CI label Jan 10, 2023
@mvines
Copy link
Member

mvines commented Jan 10, 2023

Can you please run cargo fmt and update the PR with the result. Doing so should get CI green here. Thanks!

@joncinque joncinque added the CI Pull Request is ready to enter CI label Jan 13, 2023
@solana-grimes solana-grimes removed the CI Pull Request is ready to enter CI label Jan 13, 2023
@joncinque
Copy link
Contributor

Looks like this is failing on the audit check, which was fixed in #29587 -- could you rebase and try one more time?

@joncinque joncinque added the CI Pull Request is ready to enter CI label Jan 24, 2023
@solana-grimes solana-grimes removed the CI Pull Request is ready to enter CI label Jan 24, 2023
@joncinque
Copy link
Contributor

I'm so sorry, it looks like this needs one more rebase. Can you try that one more time and ping me so I can run CI right away?

@joncinque joncinque added the CI Pull Request is ready to enter CI label Jan 25, 2023
@solana-grimes solana-grimes removed the CI Pull Request is ready to enter CI label Jan 25, 2023
@joncinque
Copy link
Contributor

Thanks for your patience, all good finally!

@joncinque joncinque merged commit 7d28696 into solana-labs:master Jan 25, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
community Community contribution
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Streamer cannot compile using musl
5 participants