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

Haiku: fix build as IP_RECVTOS does not exist (v0.4.x) #438

Merged
merged 1 commit into from Apr 3, 2024

Conversation

nielx
Copy link
Contributor

@nielx nielx commented Apr 28, 2023

This is a backport of #369 / commit ed23383

@Thomasdezeeuw
Copy link
Collaborator

Actually this is target v0.4.x, which isn't allowed. Please target main instead.

@nielx
Copy link
Contributor Author

nielx commented Mar 30, 2024

@Thomasdezeeuw Could this change be reconsidered? We are about a year later and despite all attempts, the 0.4.x branch does not want to seem to die. I have cherry-picked the patch on the latest commit in the 0.4.x branch, and it still applies (and builds).

@Thomasdezeeuw
Copy link
Collaborator

It was never about not accepting the change. But our policy is to apply it to main first and only then backport it. Otherwise patches and fixes become undone between versions.

@nielx
Copy link
Contributor Author

nielx commented Mar 30, 2024

I parsed the original rejection comment differently.

In any case, the changes are on main (as part of ed23383), so this retroactively is a backport now.

@Thomasdezeeuw
Copy link
Collaborator

I parsed the original rejection comment differently.

That's too bad about the miscommunication.

In any case, the changes are on main (as part of ed23383), so this retroactively is a backport now.

Can you update the commit saying it's a backport of that commit? That way I can keep track of everything.

@Thomasdezeeuw Thomasdezeeuw reopened this Apr 2, 2024
@nielx
Copy link
Contributor Author

nielx commented Apr 3, 2024

Commit rebased, commit message and PR description updated.

@Thomasdezeeuw Thomasdezeeuw merged commit 2c4e104 into rust-lang:v0.4.x Apr 3, 2024
18 of 19 checks passed
@Thomasdezeeuw
Copy link
Collaborator

Thanks @nielx

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