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

psumbera · 2025-03-19T10:23:21Z

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 · 2025-03-19T10:23:26Z

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 · 2025-03-19T10:23:28Z

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.

src/tools/rust-analyzer/Cargo.toml

Cargo.toml

jieyouxu · 2025-03-20T04:08:34Z

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

bors · 2025-04-15T08:56:07Z

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

marcoieni · 2025-04-16T13:40:17Z

Is this ready for review? 👀

src/tools/rust-analyzer/Cargo.lock

…cola update libc This is needed for rust-lang#138699 (comment)

Rollup merge of rust-lang#139969 - psumbera:libc-rust-analyzer, r=lnicola update libc This is needed for rust-lang#138699 (comment)

update libc This is needed for rust-lang/rust#138699 (comment)

marcoieni · 2025-04-22T09:50:16Z

src/ci/docker/scripts/solaris-toolchain.sh

+BINUTILS_URL="https://ftp.gnu.org/gnu/binutils/$BINUTILS_TAR"
+
+
+download_file() {


I saw this function is duplicated from illuminos-toolchain.sh
Can you move it to a shared script file or similar and source the file? so that we avoid having duplicate code.

Same is true for other parts of the scripts which are very similar

I saw this function is duplicated from illuminos-toolchain.sh Can you move it to a shared script file or similar and source the file? so that we avoid having duplicate code.

I have moved it into shared.sh.

Same is true for other parts of the scripts which are very similar

There are no other common functions. While the structure looks similiar I don't think it's good to connect these two more.

marcoieni · 2025-04-22T09:50:20Z

Sorry for the wait, I'm having a look now. I'm familiar with the Rust CI in general but not with solaris specifically, so please don't assume I'm familiar with the scripts you edited 👍

From what I can see you are extracting the build of x86_64-solaris and sparcv9-solaris from the dist-various-2 job.
My first question is: why? What's the advantage with respect to keeping these jobs in the dist-various-2 job?

The second question is: the dockerfile of dist-various-2 uses ubuntu:22.04. Why are you using ubuntu:18.04 for the new dockerfiles? Is it possible to use newer ubuntu images?
Same for older software like python2. Previously python2 wasn't needed in dist-various-2, why do we need it now?

Also can you explain how this PR fixes the issue you linked?

psumbera · 2025-04-24T07:26:08Z

From what I can see you are extracting the build of x86_64-solaris and sparcv9-solaris from the dist-various-2 job. My first question is: why? What's the advantage with respect to keeping these jobs in the dist-various-2 job?

dist-various-2 was generating just standard library for Solaris. Now also host tools are generated. So I think it's correct to move it outside of dist-various-2 job and have separate job like Illumos or BSDs.

The second question is: the dockerfile of dist-various-2 uses ubuntu:22.04. Why are you using ubuntu:18.04 for the new dockerfiles? Is it possible to use newer ubuntu images? Same for older software like python2. Previously python2 wasn't needed in dist-various-2, why do we need it now?

I have updated change to use ubuntu:22.04 and python3.

Also can you explain how this PR fixes the issue you linked?

I was asked in #126025 to do clean up. I decided to clean it up by compleltely removing all Solaris related stuff from dist-various-2 and have bright new build job for Solaris :-)

marcoieni

A few minor comments.
@Kobzol can you have a look at this PR as well?

marcoieni · 2025-04-24T08:55:18Z

src/ci/docker/host-x86_64/dist-sparcv9-solaris/Dockerfile

+FROM ubuntu:22.04
+
+# Enable source repositories, which are disabled by default on Ubuntu >= 18.04
+RUN sed -i 's/^# deb-src/deb-src/' /etc/apt/sources.list


is this still needed for ubuntu 22?
Same comment for the other dockerfile

marcoieni · 2025-04-24T08:56:02Z

src/ci/docker/host-x86_64/dist-sparcv9-solaris/Dockerfile

+COPY scripts/cross-apt-packages.sh /tmp/
+RUN bash /tmp/cross-apt-packages.sh
+
+# Required for cross-build gcc, and we install python3 to test general compatibility.


Required for cross-build gcc

What's required for cross-build among the packages we install?

and we install python3 to test general compatibility.

What do you mean?

Same comment for the other dockerfile

marcoieni · 2025-04-24T09:13:22Z

src/ci/docker/scripts/solaris-toolchain.sh

+
+#
+# The illumos and the Solaris build both use the same GCC-level host triple,
+# though different versions of GCC are used and with different configure


Suggested change

# though different versions of GCC are used and with different configure

# though different versions of GCC are used and with different configuration

I'm not native english speaker, so correct me if I'm wrong

marcoieni · 2025-04-24T09:17:51Z

src/ci/docker/scripts/solaris-toolchain.sh

+SYSROOT_VER='2025-02-21'
+SYSROOT_SUM='e82b78c14464cc2dc71f3cdab312df3dd63441d7c23eeeaf34d41d8b947688d3'
+SYSROOT_TAR="solaris-11.4.42.111.0-i386-sysroot-v$SYSROOT_VER.tar.bz2"
+SYSROOT_URL="https://github.com/psumbera/solaris-sysroot/releases/download/v$SYSROOT_VER/"


the variables SYSROOT_VER and SYSROOT_URL can be moved outside of the if, because they are the same for both branches.

marcoieni · 2025-04-24T09:22:59Z

src/ci/docker/scripts/solaris-toolchain.sh

+SYSROOT_VER='2025-02-21'
+SYSROOT_SUM='e249a7ef781b9b3297419bd014fa0574800703981d84e113d6af3a897a8b4ffc'
+SYSROOT_TAR="solaris-11.4.42.111.0-sparc-sysroot-v$SYSROOT_VER.tar.bz2"
+SYSROOT_URL="https://github.com/psumbera/solaris-sysroot/releases/download/v$SYSROOT_VER/"


for security and availability reasons, we probably prefer to download artifacts from our ci-mirrors.

Can you add this to https://github.com/rust-lang/ci-mirrors/tree/main/files ?

marcoieni · 2025-04-24T09:24:37Z

src/ci/docker/scripts/solaris-toolchain.sh

+BINUTILS_SUM='f66390a661faa117d00fab2e79cf2dc9d097b42cc296bf3f8677d1e7b452dc3a'
+BINUTILS_BASE="binutils-$BINUTILS_VERSION"
+BINUTILS_TAR="$BINUTILS_BASE.tar.bz2"
+BINUTILS_URL="https://ftp.gnu.org/gnu/binutils/$BINUTILS_TAR"


for security and availability reasons, we probably prefer to download artifacts from our ci-mirrors.

Can you add this to https://github.com/rust-lang/ci-mirrors/tree/main/files ?

marcoieni · 2025-04-24T09:28:43Z

src/ci/docker/scripts/solaris-toolchain.sh

+        download_file "/tmp/$GCC_TAR" "$GCC_URL" "$GCC_SUM"
+        mkdir -p /ws/src/gcc
+        cd /ws/src/gcc
+        tar -xJf "/tmp/$GCC_TAR"
+        rm -f "/tmp/$GCC_TAR"


this pattern is duplicated at line 78 and 86, can we extract it into a function?

marcoieni · 2025-04-24T09:30:55Z

src/ci/docker/scripts/solaris-toolchain.sh

+        mkdir -p "$PREFIX"
+        make install
+
+        cd /


Suggested change

cd /

cd -

Why do you cd into root? Is going to the previous directory more correct in your opinion?
Same at line 171

marcoieni · 2025-04-24T09:31:37Z

src/ci/github-actions/jobs.yml

+    <<: *job-linux-4c
+
+  - name: dist-sparcv9-solaris
+    <<: *job-linux-4c


can you run [at]bors try?
Otherwise I can do it for you to test this PR 👍

marcoieni · 2025-04-24T09:32:29Z

src/ci/docker/scripts/solaris-toolchain.sh

+EOF
+        expand -t 4 binutils-2.44/bfd/elflink.c > binutils-2.44/bfd/elflink.c.exp
+        mv binutils-2.44/bfd/elflink.c.exp binutils-2.44/bfd/elflink.c
+        patch binutils-2.44/bfd/elflink.c < binutils.patch


2.44 is duplicated in this file, I wonder if we can extract this version number into a variable?

nikic · 2025-04-24T13:21:55Z

dist-various-2 was generating just standard library for Solaris. Now also host tools are generated. So I think it's correct to move it outside of dist-various-2 job and have separate job like Illumos or BSDs.

To clarify, you are promoting Solaris targets from Tier 2 to Tier 2 with host tools?

There should be an update to the platform support pages and a compiler MCP for the promotion (https://doc.rust-lang.org/nightly/rustc/target-tier-policy.html#tier-2-with-host-tools).

Kobzol · 2025-04-24T13:23:31Z

Yeah, just wanted to post this, this seems like it moves the Solaris target between tiers, so it should go through an MCP.

rustbot assigned marcoieni Mar 19, 2025

Veykril reviewed Mar 19, 2025

View reviewed changes

src/tools/rust-analyzer/Cargo.toml Outdated Show resolved Hide resolved

This comment has been minimized.

Sign in to view

jieyouxu reviewed Mar 19, 2025

View reviewed changes

Cargo.toml Outdated Show resolved Hide resolved

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

This comment has been minimized.

Sign in to view

psumbera mentioned this pull request Mar 21, 2025

temporarily define O_DIRECT and SIGINFO for Solaris rust-lang/libc#4348

Merged

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

Veykril reviewed Apr 16, 2025

View reviewed changes

src/tools/rust-analyzer/Cargo.lock Outdated Show resolved Hide resolved

psumbera mentioned this pull request Apr 17, 2025

update libc #139969

Merged

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Apr 17, 2025

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

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

Rollup merge of #139969 - psumbera:libc-rust-analyzer, r=lnicola

4021a34

update libc This is needed for rust-lang/rust#138699 (comment)

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

Rollup merge of #139969 - psumbera:libc-rust-analyzer, r=lnicola

2806093

update libc This is needed for rust-lang/rust#138699 (comment)

jieyouxu removed the T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) label Apr 22, 2025

marcoieni reviewed Apr 22, 2025

View reviewed changes

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

d5925a8

psumbera force-pushed the solaris-ci-build3 branch from 7152b36 to d5925a8 Compare April 24, 2025 07:10

marcoieni reviewed Apr 24, 2025

View reviewed changes

psumbera mentioned this pull request Apr 24, 2025

Add Solaris sysroot rust-lang/ci-mirrors#8

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

psumbera commented Mar 19, 2025

rustbot commented Mar 19, 2025

rustbot commented Mar 19, 2025

This comment has been minimized.

This comment has been minimized.

jieyouxu commented Mar 20, 2025

bors commented Apr 15, 2025

marcoieni commented Apr 16, 2025

marcoieni Apr 22, 2025 •

edited

Loading

psumbera Apr 24, 2025

marcoieni commented Apr 22, 2025 •

edited

Loading

psumbera commented Apr 24, 2025

marcoieni left a comment

marcoieni Apr 24, 2025

marcoieni Apr 24, 2025

marcoieni Apr 24, 2025

marcoieni Apr 24, 2025

marcoieni Apr 24, 2025

marcoieni Apr 24, 2025

marcoieni Apr 24, 2025

marcoieni Apr 24, 2025

marcoieni Apr 24, 2025 •

edited

Loading

marcoieni Apr 24, 2025

nikic commented Apr 24, 2025

Kobzol commented Apr 24, 2025

		BINUTILS_URL="https://ftp.gnu.org/gnu/binutils/$BINUTILS_TAR"


		download_file() {

	# though different versions of GCC are used and with different configure
	# though different versions of GCC are used and with different configuration

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

Are you sure you want to change the base?

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

Conversation

psumbera commented Mar 19, 2025

rustbot commented Mar 19, 2025

rustbot commented Mar 19, 2025

This comment has been minimized.

This comment has been minimized.

jieyouxu commented Mar 20, 2025

bors commented Apr 15, 2025

marcoieni commented Apr 16, 2025

marcoieni Apr 22, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

marcoieni commented Apr 22, 2025 • edited Loading

psumbera commented Apr 24, 2025

marcoieni left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

marcoieni Apr 24, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

nikic commented Apr 24, 2025

Kobzol commented Apr 24, 2025

marcoieni Apr 22, 2025 •

edited

Loading

marcoieni commented Apr 22, 2025 •

edited

Loading

marcoieni Apr 24, 2025 •

edited

Loading