Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

[0.2] Backports #4017

Merged
merged 3 commits into from
Nov 7, 2024
Merged

[0.2] Backports #4017

merged 3 commits into from
Nov 7, 2024

Conversation

tgross35
Copy link
Contributor

@tgross35 tgross35 commented Nov 7, 2024

Backport the following Solaris changes:

Also cherry picks the backport of #3634 so this can start before #4016 merges.

@rustbot
Copy link
Collaborator

rustbot commented Nov 7, 2024

r? @JohnTitor

rustbot has assigned @JohnTitor.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot
Copy link
Collaborator

rustbot commented Nov 7, 2024

Some changes occurred in OpenBSD module

cc @semarie

Some changes occurred in solarish module

cc @jclulow, @pfmooney

@tgross35 tgross35 enabled auto-merge November 7, 2024 04:54
@tgross35 tgross35 force-pushed the backport-watercress branch from 539bbaf to cc2f5aa Compare November 7, 2024 05:26
@bors
Copy link
Contributor

bors commented Nov 7, 2024

☔ The latest upstream changes (presumably #4016) made this pull request unmergeable. Please resolve the merge conflicts.

@tgross35 tgross35 force-pushed the backport-watercress branch from cc2f5aa to acb03cc Compare November 7, 2024 05:53
@tgross35
Copy link
Contributor Author

tgross35 commented Nov 7, 2024

Including #4019 so this can merge without conflict

@tgross35 tgross35 force-pushed the backport-watercress branch from acb03cc to 2eb8321 Compare November 7, 2024 05:55
psumbera and others added 3 commits November 7, 2024 01:12
(backport <rust-lang#3864>)
(cherry picked from commit ec3c338)
Constants added from [this commit].

[this commit]: illumos/illumos-gate@0250c53

Additionally, resolves some issues introduced in ec3c338 ("Fix tests on
Solaris").

[ add note about fixing ec3c338 - Trevor ]
(backport <rust-lang#3999>)
(cherry picked from commit e2a23f0)
@tgross35 tgross35 force-pushed the backport-watercress branch from 2eb8321 to 61150a4 Compare November 7, 2024 07:12
@tgross35 tgross35 added this pull request to the merge queue Nov 7, 2024
Merged via the queue into rust-lang:libc-0.2 with commit 7ee37b9 Nov 7, 2024
54 checks passed
@tgross35 tgross35 deleted the backport-watercress branch November 7, 2024 08:23
@epage
Copy link

epage commented Feb 4, 2025

Did this result in a breaking change in the 0.2 releases? Thats at least how it sounds from rust-lang/cargo#15143

@tgross35
Copy link
Contributor Author

tgross35 commented Feb 4, 2025

It was not mentioned specifically but Solaris does not have flock, so having that exposed was a bug. The relevant PR is #3864.

@pfmooney
Copy link
Contributor

pfmooney commented Feb 4, 2025

But removing the flock-related defines from illumos would still be breaking.

@tgross35
Copy link
Contributor Author

tgross35 commented Feb 4, 2025

They should not have been removed from illumos right?

libc/src/unix/mod.rs

Lines 1571 to 1575 in 0f9f8c9

if #[cfg(not(target_os = "solaris"))] {
extern "C" {
pub fn flock(fd: c_int, operation: c_int) -> c_int;
}
}

@pfmooney
Copy link
Contributor

pfmooney commented Feb 4, 2025

Sorry, I misread and through the LOCK_* bits had gotten lost in the shuffle.

AkhilTThomas pushed a commit to AkhilTThomas/libc that referenced this pull request Feb 5, 2025
# for free to join this conversation on GitHub. Already have an account? # to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants