Skip to content

utmpx api for linux musl + musl few build fixes. #3213

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
Merged
merged 1 commit into from
Jan 8, 2024
Merged

utmpx api for linux musl + musl few build fixes. #3213

merged 1 commit into from
Jan 8, 2024

Conversation

devnexen
Copy link
Contributor

close #3190

@rustbot
Copy link
Collaborator

rustbot commented Apr 21, 2023

r? @JohnTitor

(rustbot has picked a reviewer for you, use r? to override)

@Ecordonnier
Copy link
Contributor

What does s-blocked mean in this context? Is there an issue with the code?

@joshtriplett
Copy link
Member

Why is this trying to change O_LARGEFILE?

@devnexen
Copy link
Contributor Author

devnexen commented Jun 7, 2023

I just looked at an alpine instance, O_LARGEFILE on x86_64 arch is the same as android so 0o100000

@devnexen devnexen force-pushed the utmpx_linux_musl branch from 463286a to e14037e Compare June 7, 2023 22:09
@devnexen devnexen force-pushed the utmpx_linux_musl branch 2 times, most recently from 922b9b1 to e0bd2df Compare July 22, 2023 07:02
@devnexen devnexen mentioned this pull request Jul 22, 2023
Closed
@tertsdiepraam tertsdiepraam mentioned this pull request Aug 19, 2023
Closed
@Ecordonnier
Copy link
Contributor

When can this PR be merged? Is it blocked waiting for a future release?

@Ecordonnier
Copy link
Contributor

@devnexen do you know what is blocking the merge of this PR?

@devnexen
Copy link
Contributor Author

@joshtriplett did I answer your question ?
@JohnTitor would you mind reviewing it ?
thanks.

@Ecordonnier
Copy link
Contributor

@JohnTitor can this be merged? What does the tag "breakage-candidate" mean?

@Ecordonnier
Copy link
Contributor

John sent me this email explaining why this pull-request cannot be merged at the moment:

The problem here is that we currently support musl 1.1.24 or lower and changing struct field is a breaking change.
The versioning of libc is a bit tricky and we haven't updated our minor version, i.e. shipped a major change for a while.
We're planning to release libc 0.3 with musl 1.2 support, but there are some blockers (you can check related issues).
Meanwhile, maybe we can add a new Cargo feature to allow newer structs, fields, values, etc. to support modern versions.
I'm going to implement a way to resolve this situation.

@JohnTitor
Copy link
Member

Turned out that the Cargo feature way I mentioned above isn't pragmatic, and we have to make libc 0.3 real. See #3488 (comment) for more details.

JohnTitor
JohnTitor reviewed Dec 19, 2023
View reviewed changes
src/unix/linux_like/linux/musl/mod.rs
Comment on lines +783 to +909
pub fn getutxent() -> *mut utmpx;
pub fn getutxid(ut: *const utmpx) -> *mut utmpx;
pub fn getutxline(ut: *const utmpx) -> *mut utmpx;
pub fn pututxline(ut: *const utmpx) -> *mut utmpx;
pub fn setutxent();
pub fn endutxent();
Copy link
Member

Choose a reason for hiding this comment

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

For now, we can merge non-breaking changes like this.

@JohnTitor
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Jan 8, 2024

📌 Commit e3caaf6 has been approved by JohnTitor

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Jan 8, 2024

⌛ Testing commit e3caaf6 with merge 28ef7fe...

@bors
Copy link
Contributor

bors commented Jan 8, 2024

☀️ Test successful - checks-actions, checks-cirrus-freebsd-13, checks-cirrus-freebsd-14
Approved by: JohnTitor
Pushing 28ef7fe to main...

@bors bors merged commit 28ef7fe into rust-lang:main Jan 8, 2024
@bors bors mentioned this pull request Jan 8, 2024
Merged
@andrewliebenow andrewliebenow mentioned this pull request Sep 9, 2024
Closed
@tgross35 tgross35 added the stable-nominated This PR should be considered for cherry-pick to libc's stable release branch label Nov 17, 2024
tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Nov 17, 2024
@devnexen @tgross35
utmpx api for linux musl.
05091c3 
close rust-lang#3190

(backport <rust-lang#3213>)
(cherry picked from commit e3caaf6)
@tgross35 tgross35 mentioned this pull request Nov 17, 2024
Merged
tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Nov 17, 2024
@devnexen @tgross35
utmpx api for linux musl.
5c5007f 
close rust-lang#3190

(backport <rust-lang#3213>)
(cherry picked from commit e3caaf6)
tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Nov 17, 2024
@devnexen @tgross35
utmpx api for linux musl.
face160 
close rust-lang#3190

(backport <rust-lang#3213>)
(cherry picked from commit e3caaf6)
tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Nov 17, 2024
@devnexen @tgross35
utmpx api for linux musl.
870f096 
close rust-lang#3190

(backport <rust-lang#3213>)
(cherry picked from commit e3caaf6)
@tgross35 tgross35 added stable-applied This PR has been cherry-picked to libc's stable release branch and removed stable-nominated This PR should be considered for cherry-pick to libc's stable release branch labels Nov 18, 2024
@andrewdavidmackenzie andrewdavidmackenzie mentioned this pull request Nov 26, 2024
Closed
@shadow3aaa shadow3aaa mentioned this pull request Dec 1, 2024
Merged
@Ecordonnier
Copy link
Contributor

Ecordonnier commented Mar 11, 2025 •
edited
Loading

Now that this has been backported to the 0.2 branch, I tested the build of uutils-coreutils with the libc crate and musl using this commit, however FYI due to the lack of the utmpxname function, as well as the symbols "libc::__UT_HOSTSIZE", "libc::__UT_LINESIZE", "libc::__UT_NAMESIZE" and "libc::ACCOUNTING", I wasn't able to compile uutils-coreutils.

@tgross35
Copy link
Contributor

@Ecordonnier If you are interested in putting up a PR, though should be reasonably trivial to add. Otherwise just copy that to a new issue, somebody will likely pick it up reasonably fast.

@Ecordonnier
Copy link
Contributor

@tgross35 I created #4322 as follow-up issue. I'll try to work on this if I find some time.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@JohnTitor JohnTitor JohnTitor approved these changes

Assignees

@JohnTitor JohnTitor

Labels

S-waiting-on-bors stable-applied This PR has been cherry-picked to libc's stable release branch

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

utmp function family missing on musl

7 participants

@devnexen @rustbot @Ecordonnier @joshtriplett @JohnTitor @bors @tgross35