Skip to content

build dist for x86_64-pc-solaris and sparcv9-sun-solaris #138699

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
Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

build dist for x86_64-pc-solaris and sparcv9-sun-solaris #138699

wants to merge 1 commit into from
+291 −122

Conversation

psumbera
Copy link
Contributor

FIx for #126025

Note that this needs Nix with following commit:
nix-rust/nix@0f45593
Unfortunatelly there is no new release.

And for sparcv9 it needs also:
tov/libffi-rs#103

For now it therefore uses cargo patch infrastructure for these.

@rustbot
Copy link
Collaborator

rustbot commented Mar 19, 2025

r? @marcoieni

rustbot has assigned @marcoieni.
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 rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. labels Mar 19, 2025
@rustbot
Copy link
Collaborator

rustbot commented Mar 19, 2025

rust-analyzer is developed in its own repository. If possible, consider making this change to rust-lang/rust-analyzer instead.

cc @rust-lang/rust-analyzer

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

Veykril
Veykril reviewed Mar 19, 2025
View reviewed changes
src/tools/rust-analyzer/Cargo.toml Outdated
@@ -33,6 +33,7 @@ inherits = "release"
debug = 2

[patch.'crates-io']
nix = { git = "https://github.com/psumbera/nix.git", branch = "mypatch-v28" }
Copy link
Member

Choose a reason for hiding this comment

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

This is not going to happen, this will break our crates-io releases.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Is waiting for new nix version the only option here? Last nix release is from May 2024..

Copy link
Member

Choose a reason for hiding this comment

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

Unfortunately I think that's the case, AFAIK neither r-a nor the root manifest here can use cargo patch functionality.

For the root manifest here, I believe we can't be pointing to non-rust-lang/* forks via git dependencies too for supply-chain security reasons, cc @pietroalbini.

@rust-log-analyzer

This comment has been minimized.

Sign in to view
jieyouxu
jieyouxu reviewed Mar 19, 2025
View reviewed changes
Cargo.toml Outdated
Comment on lines 93 to 95
[patch.crates-io]
nix = { git = "https://github.com/psumbera/nix.git", branch = "mypatch" }
libffi-sys = { git = "https://github.com/psumbera/libffi-rs.git", branch = "sparcv9" }
Copy link
Member

Choose a reason for hiding this comment

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

These should be fixed upstream, we really cannot be repointing these deps to the non-upstream forks.

@psumbera psumbera force-pushed the solaris-ci-build3 branch from 3b9fbda to 0deec39 Compare March 19, 2025 11:00
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@jieyouxu
Copy link
Member

(That being said, thank you for investigating fixes for the Solaris CI)

@psumbera psumbera mentioned this pull request Mar 21, 2025
Merged
@bors
Copy link
Collaborator

bors commented Apr 15, 2025

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

@psumbera psumbera force-pushed the solaris-ci-build3 branch from 0deec39 to f556156 Compare April 16, 2025 10:15
@marcoieni
Copy link
Member

Is this ready for review? 👀

Veykril
Veykril reviewed Apr 16, 2025
View reviewed changes
src/tools/rust-analyzer/Cargo.lock Outdated
Copy link
Member

Choose a reason for hiding this comment

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

is this change needed?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, new libc is needed for rust-analyzer too.

Copy link
Member

@marcoieni marcoieni Apr 17, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

Can you update libc in a separate PR so that we keep the number of changes of this PR as small as possible?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I have created: #139969 . Once it's pulled I can rebase...

@psumbera psumbera mentioned this pull request Apr 17, 2025
Merged
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Apr 17, 2025
@matthiaskrgr
Rollup merge of rust-lang#139969 - psumbera:libc-rust-analyzer, r=lni…
4c92186 
…cola

update libc

This is needed for rust-lang#138699 (comment)
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Apr 18, 2025
@rust-timer
Unrolled build for rust-lang#139969
bb3671a 
Rollup merge of rust-lang#139969 - psumbera:libc-rust-analyzer, r=lnicola

update libc

This is needed for rust-lang#138699 (comment)
github-actions bot pushed a commit to rust-lang/miri that referenced this pull request Apr 18, 2025
@matthiaskrgr
Rollup merge of #139969 - psumbera:libc-rust-analyzer, r=lnicola
4021a34 
update libc

This is needed for rust-lang/rust#138699 (comment)
@psumbera psumbera force-pushed the solaris-ci-build3 branch from f556156 to 7152b36 Compare April 18, 2025 05:49
github-actions bot pushed a commit to rust-lang/rustc-dev-guide that referenced this pull request Apr 19, 2025
@matthiaskrgr
Rollup merge of #139969 - psumbera:libc-rust-analyzer, r=lnicola
2806093 
update libc

This is needed for rust-lang/rust#138699 (comment)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Veykril Veykril Veykril left review comments

@marcoieni marcoieni marcoieni left review comments

@jieyouxu jieyouxu jieyouxu left review comments

Assignees

@marcoieni marcoieni

Labels
A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@psumbera @rustbot @rust-log-analyzer @jieyouxu @bors @marcoieni @Veykril