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

dev-lang/rust: Fix build with musl 1.2.4 #32488

Closed
wants to merge 1 commit into from

Conversation

vimproved
Copy link
Contributor

Rust 1.72.0 bumped the version of the libc crate required by the std to 0.2.146, which finally means that the stdlib no longer references LFS64 symbols. This commit make rust 1.72.0 bootstrap from 1.72.0, and adds a patch that bumps all remaining dependencies on libc <0.2.146 in vendored crates.

@gentoo-bot
Copy link

Pull Request assignment

Submitter: @vimproved
Areas affected: ebuilds
Packages affected: dev-lang/rust

dev-lang/rust: @gyakovlev, @gentoo/rust

Linked bugs

No bugs to link found. If your pull request references any of the Gentoo bug reports, please add appropriate GLEP 66 tags to the commit message and request reassignment.

If you do not receive any reply to this pull request, please open or link a bug to attract the attention of maintainers.


In order to force reassignment and/or bug reference scan, please append [please reassign] to the pull request title.

Docs: Code of ConductCopyright policy (expl.) ● DevmanualGitHub PRsProxy-maint guide

@gentoo-bot gentoo-bot added assigned PR successfully assigned to the package maintainer(s). no bug found No Bug/Closes found in the commits. labels Aug 28, 2023
@vimproved
Copy link
Contributor Author

Pinging @xen0n since he's been doing a lot of rust work while gyakovlev is away.

@orbea
Copy link
Contributor

orbea commented Aug 28, 2023

@vimproved You might want to link this to the Gentoo issue. https://bugs.gentoo.org/903607

@thesamesam thesamesam requested a review from xen0n August 29, 2023 02:09
@vimproved
Copy link
Contributor Author

vimproved commented Aug 29, 2023

Any clue what's going on with the CI? pkgcheck isn't giving me anything...

@orbea
Copy link
Contributor

orbea commented Aug 29, 2023

Any clue what's going on with the CI? pkgcheck isn't giving me anything...

ConflictingChksums	distfile 'rust-1.72.0-arm-unknown-linux-gnueabihf.tar.xz' has different checksums (blake2b, sha512, size) for package: dev-lang/rust

I ran into it when applying your fix locally, my workaround was to remove rust-1.72.0-arm-unknown-linux-gnueabihf.tar.xz* from /var/cache/distfiles and the corresponding lines from the Manifest file, then regenerated the Manifest with pkgdev manifest.

I have also run into similar in the past with older rust versions for other bootstrap tarballs, maybe upstream is modifying these files after release?

@vimproved
Copy link
Contributor Author

Any clue what's going on with the CI? pkgcheck isn't giving me anything...

ConflictingChksums	distfile 'rust-1.72.0-arm-unknown-linux-gnueabihf.tar.xz' has different checksums (blake2b, sha512, size) for package: dev-lang/rust

I ran into it when applying your fix locally, my workaround was to remove rust-1.72.0-arm-unknown-linux-gnueabihf.tar.xz* from /var/cache/distfiles and the corresponding lines from the Manifest file, then regenerated the Manifest with pkgdev manifest.

I have also run into similar in the past with older rust versions for other bootstrap tarballs, maybe upstream is modifying these files after release?

Must have only partially downloaded. I think I fixed it.

@gentoo-repo-qa-bot
Copy link
Collaborator

Pull request CI report

Report generated at: 2023-08-29 20:55 UTC
Newest commit scanned: a4c794d
Status: ✅ good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question:
https://qa-reports.gentoo.org/output/gentoo-ci/50f6d0dc5f/output.html

@svmhdvn
Copy link
Contributor

svmhdvn commented Sep 29, 2023

Any progress on this PR? I'm running into these build issues in the musl+clang system profile.

@vimproved
Copy link
Contributor Author

Any progress on this PR? I'm running into these build issues in the musl+clang system profile.

This has been ready on my end for a while, although it appears that it needs to be rebased.

Rust 1.72.0 bumped the version of the libc crate required by the std to
0.2.146, which finally means that the stdlib no longer references LFS64
symbols. This commit make rust 1.72.0 bootstrap from 1.72.0, and adds
a patch that bumps all remaining dependencies on libc <0.2.146 in
vendored crates.

Signed-off-by: Violet Purcell <vimproved@inventati.org>
@gentoo-repo-qa-bot
Copy link
Collaborator

Pull request CI report

Report generated at: 2023-10-01 21:01 UTC
Newest commit scanned: 21d1cdc
Status: ✅ good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question:
https://qa-reports.gentoo.org/output/gentoo-ci/fcf4ee17cb/output.html

Copy link
Member

@xen0n xen0n left a comment

Choose a reason for hiding this comment

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

Ah, I've never noticed before that this only touches dev-lang/rust and nothing else. Should be good to go (we can always fix later should anything go wrong), sorry for the long delay!

@gentoo-bot gentoo-bot closed this in 515b592 Oct 2, 2023
@vimproved vimproved deleted the rust-musl-1.2.4 branch November 29, 2023 16:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
assigned PR successfully assigned to the package maintainer(s). no bug found No Bug/Closes found in the commits.
Projects
None yet
6 participants