rustup: new, 1.28.1 by 500-internal-server-error · Pull Request #20989 · msys2/MINGW-packages

500-internal-server-error · 2024-05-24T10:44:21Z

Supersedes #20923

Forgot to do the work in a separate branch, updating master on my fork caused merge conflicts :)

mingw-w64-rustup/rustup-profile.sh

mingw-w64-rustup/PKGBUILD

ArchGuyWu · 2024-08-04T09:11:10Z

It seems that symlinking issue will be resolved when this gets merged.

mati865 · 2024-08-04T09:33:05Z

I thought so initially but I'm bot sure if all the tools will handle symlinks properly. This largerly depnds on Cygwin and will require manual testing.

500-internal-server-error · 2024-08-04T14:07:42Z

Until then, would hard linking as this package does be an acceptable solution? It still gains the space savings and still avoids the requiring admin perms problem.

ArchGuyWu · 2024-08-07T00:07:20Z

Until then, would hard linking as this package does be an acceptable solution? It still gains the space savings and still avoids the requiring admin perms problem.

I think you can try to create symlink in post-install, if it fails then create *.sh and *.cmd.

mingw-w64-rustup/post.install

ognevny · 2025-04-14T11:28:28Z

I see you didn't apply a patch to properly build aws-lc-sys in clang: https://github.com/msys2/MINGW-packages/blob/master/mingw-w64-zed/aws-lc-clang-build.patch

500-internal-server-error · 2025-04-14T11:58:26Z

Where should I patch it? I don't see an obvious place, the path used that example does not exist here.

ognevny · 2025-04-14T13:52:34Z

Where should I patch it? I don't see an obvious place, the path used that example does not exist here.

add git to makedepends
vendor aws-lc and aws-lc-rs sources, add this to source

"git+https://github.com/aws/aws-lc-rs.git#tag=aws-lc-sys/v0.27.1"
"git+https://github.com/aws/aws-lc.git"

manage submodules of aws-lc-rs

(cd aws-lc-rs
git config submodule."aws-lc-sys/aws-lc".url "${srcdir}/aws-lc"
git config submodule."aws-lc-fips-sys/aws-lc".url "${srcdir}/aws-lc"
git -c protocol.file.allow=always submodule update --init --recursive)

apply patch with

if [[ ${CC} == clang ]]; then
  patch -d "${srcdir}/aws-lc-rs/aws-lc-sys/aws-lc" -p1 -i "${srcdir}/aws-lc-clang-build.patch"
fi

patching lockfiles can be hard, better remove your patch and add

cat >> Cargo.toml <<END

[patch.crates-io]
aws-lc-sys = { path = "../aws-lc-rs/aws-lc-sys" }
END

cargo update -p aws-lc-sys -p aws-lc-rs --precise 1.12.6

or... use this PKGBUILD:

PKGBUILD

_realname=rustup
pkgbase=mingw-w64-${_realname}
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
pkgver=1.28.1
pkgrel=1
pkgdesc="The Rust toolchain installer (mingw-w64)"
arch=('x86_64')
mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
url="https://github.com/rust-lang/rustup"
license=('spdx:Apache-2.0 AND MIT')
msys2_references=(
	'archlinux: rustup'
)
depends=(
	"${MINGW_PACKAGE_PREFIX}-curl"
	"${MINGW_PACKAGE_PREFIX}-xz"
	"${MINGW_PACKAGE_PREFIX}-zstd"
)
makedepends=(
	"${MINGW_PACKAGE_PREFIX}-rust"
	"${MINGW_PACKAGE_PREFIX}-cmake"
	"${MINGW_PACKAGE_PREFIX}-nasm"
)
optdepends=(
	"${MINGW_PACKAGE_PREFIX}-gdb: rust-gdb script"
	"${MINGW_PACKAGE_PREFIX}-lldb: rust-lldb script"
)
provides=("${MINGW_PACKAGE_PREFIX}-rust")
conflicts=("${MINGW_PACKAGE_PREFIX}-rust")
install='post.install'
options=("!lto")
source=(
	"rustup-${pkgver}.tar.gz::${url}/archive/${pkgver}.tar.gz"
	"git+https://github.com/aws/aws-lc-rs.git#tag=aws-lc-sys/v0.27.1"
	"git+https://github.com/aws/aws-lc.git"
	"aws-lc-clang-build.patch"
	"rustup-profile.sh"
)
sha256sums=('2def2f9a0a4a21c80f862c0797c2d76e765e0e7237e1e41f28324722ab912bac'
            '5f564de6fb744db858d50ca3a1f0ce737f3d505fea7023c12d3cea3f61eaa20b'
            'SKIP'
            '2e3d7ef6fdb3ef8a2ec11207e8120ea34553888116ea8a032cb425a8a6261c39'
            'dec8fd8b2838e7e5866a0bfbae2be89647c7c70a46c0ada1406accf4017322e9')
_binlinks=('cargo' 'rustc' 'rustdoc' 'rust-gdb' 'rust-lldb' 'rustfmt' 'cargo-fmt' 'cargo-clippy' 'clippy-driver' 'cargo-miri')

prepare() {
  (cd aws-lc-rs
  git config submodule."aws-lc-sys/aws-lc".url "${srcdir}/aws-lc"
  git config submodule."aws-lc-fips-sys/aws-lc".url "${srcdir}/aws-lc"
  git -c protocol.file.allow=always submodule update --init --recursive)

  if [[ ${CC} == clang ]]; then
    patch -d "${srcdir}/aws-lc-rs/aws-lc-sys/aws-lc" -p1 -i "${srcdir}/aws-lc-clang-build.patch"
  fi

	cd "${_realname}-${pkgver}"

	cat >> Cargo.toml <<END

[patch.crates-io]
aws-lc-sys = { path = "../aws-lc-rs/aws-lc-sys" }
END

  cargo update -p aws-lc-rs --precise 1.12.6
	cargo fetch --locked --target "$(rustc -vV | sed -n 's/host: //p')"
}

build() {
	cd "${_realname}-${pkgver}"
	cargo build --release --frozen --features no-self-update --bin rustup-init
}

package() {
	cd "${_realname}-${pkgver}"
	install -d "${pkgdir}/${MINGW_PREFIX}/lib/${_realname}/bin"
	install -Dm755 "target/release/rustup-init" "${pkgdir}/${MINGW_PREFIX}/bin/rustup.exe"
	for link in "${_binlinks[@]}"; do
		MSYS=winsymlinks:native ln "${pkgdir}/${MINGW_PREFIX}/bin/rustup.exe" "${pkgdir}/${MINGW_PREFIX}/bin/${link}.exe"
	done

	# Special treatment to allow for rust-analyzer to still allow the separate package version to be used.
	MSYS=winsymlinks:native ln "${pkgdir}/${MINGW_PREFIX}/bin/rustup.exe" "${pkgdir}/${MINGW_PREFIX}/lib/${_realname}/bin/rust-analyzer.exe"

	install -Dm644 "${srcdir}/rustup-profile.sh" "${pkgdir}/etc/profile.d/rustup.sh"

	# Generate completion files.
	mkdir -p "${pkgdir}/${MINGW_PREFIX}/share/bash-completion/completions"
	"${pkgdir}/${MINGW_PREFIX}/bin/rustup" completions bash > "${pkgdir}/${MINGW_PREFIX}/share/bash-completion/completions/rustup"
	"${pkgdir}/${MINGW_PREFIX}/bin/rustup" completions bash cargo > "${pkgdir}/${MINGW_PREFIX}/share/bash-completion/completions/cargo"
	mkdir -p "${pkgdir}/${MINGW_PREFIX}/share/fish/vendor_completions.d"
	"${pkgdir}/${MINGW_PREFIX}/bin/rustup" completions fish > "${pkgdir}/${MINGW_PREFIX}/share/fish/vendor_completions.d/rustup.fish"
	mkdir -p "${pkgdir}/${MINGW_PREFIX}/share/zsh/site-functions"
	"${pkgdir}/${MINGW_PREFIX}/bin/rustup" completions zsh > "${pkgdir}/${MINGW_PREFIX}/share/zsh/site-functions/_rustup"
	"${pkgdir}/${MINGW_PREFIX}/bin/rustup" completions zsh cargo > "${pkgdir}/${MINGW_PREFIX}/share/zsh/site-functions/_cargo"

	install -Dm644 LICENSE-MIT "${pkgdir}/${MINGW_PREFIX}/share/licenses/${pkgname}/LICENSE-MIT"
	install -Dm644 LICENSE-APACHE "${pkgdir}/${MINGW_PREFIX}/share/licenses/${pkgname}/LICENSE-APACHE"
}

but, I wanted to see one more thing changed... I'll leave a review

ognevny

is it possible to just copy rustup.exe to _binlinks? e.g.

cp "${pkgdir}/${MINGW_PREFIX}/bin/rustup.exe" "${pkgdir}/${MINGW_PREFIX}/bin/${link}.exe"

it's common practice for our packages, gcc example. yes, it will use much disk space, but this is the only option we can use...

mingw-w64-rustup/PKGBUILD

500-internal-server-error · 2025-04-14T16:50:11Z

is it possible to just copy rustup.exe to _binlinks? e.g.
cp "${pkgdir}/${MINGW_PREFIX}/bin/rustup.exe" "${pkgdir}/${MINGW_PREFIX}/bin/${link}.exe"
it's common practice for our packages, gcc example. yes, it will use much disk space, but this is the only option we can use...

Hard links have been around for a very long time (CreateHardLink() API since Win2K, CMD mklink support since Vista, PS New-Item support since Win8), can we not use them? It still saves space, and is available by default, unlike symlinks. Anyways, I've replaced the lns with cps.

ognevny · 2025-04-14T17:13:20Z

Hard links have been around for a very long time (CreateHardLink() API since Win2K, CMD mklink support since Vista, PS New-Item support since Win8), can we not use them? It still saves space, and is available by default, unlike symlinks. Anyways, I've replaced the lns with cps.

I thoght a bit more about this, I can try the package with hard links. but is environment variable setting required? (I almost had no experience with changing MSYS env)

500-internal-server-error · 2025-04-14T17:20:12Z

Unfortunately I've changed the links to copies, and it'll be a while before I can revert them. But no, no changes required by the end user, only while building the package (I set it to MSYS=winsymlinks:native for my personal builds).

ognevny · 2025-04-14T17:22:35Z

Unfortunately I've changed the links to copies, and it'll be a while before I can revert them. But no, no changes required by the end user, only while building the package (I set it to MSYS=winsymlinks:native for my personal builds).

I should have rights to edit your branch, so no worries

ognevny · 2025-04-14T18:05:06Z

ahh, fails like before

error: linking with `x86_64-w64-mingw32-gcc` failed: exit code: 1
  |
  = note: "x86_64-w64-mingw32-gcc" "-fno-use-linker-plugin" "-Wl,--dynamicbase" "-Wl,--disable-auto-image-base" "-m64" "-Wl,--high-entropy-va" "<sysroot>\\lib\\rustlib\\x86_64-pc-windows-gnu\\lib\\rsbegin.o" "C:\\msys64\\tmp\\rustciR9UQD\\symbols.o" "<3 object files omitted>" "-Wl,-Bstatic" "<sysroot>\\lib\\rustlib\\x86_64-pc-windows-gnu\\lib/{libstd-*,libpanic_unwind-*,libobject-*,libmemchr-*,libaddr2line-*,libgimli-*,libwindows_targets-*,librustc_demangle-*,libstd_detect-*,libhashbrown-*,librustc_std_workspace_alloc-*,libminiz_oxide-*,libadler2-*,libunwind-*,libcfg_if-*,liblibc-*,liballoc-*,librustc_std_workspace_core-*,libcore-*,libcompiler_builtins-*}.rlib" "-Wl,-Bdynamic" "-lkernel32" "-lkernel32" "-lntdll" "-luserenv" "-lws2_32" "-ldbghelp" "-lgcc_eh" "-l:libpthread.a" "-lmsvcrt" "-lmingwex" "-lmingw32" "-lgcc" "-lmsvcrt" "-lmingwex" "-luser32" "-lkernel32" "-Wl,--nxcompat" "-o" "C:\\msys64\\home\\maksa\\forks\\500ise-MINGW\\mingw-w64-rustup\\src\\rustup-1.28.1\\target\\release\\build\\proc-macro2-06a3aa365bbe001c\\build_script_build-06a3aa365bbe001c.exe" "-Wl,--gc-sections" "-no-pie" "-Wl,--strip-debug" "-nodefaultlibs" "<sysroot>\\lib\\rustlib\\x86_64-pc-windows-gnu\\lib\\rsend.o"
  = note: some arguments are omitted. use `--verbose` to show all linker arguments
  = note: x86_64-w64-mingw32-gcc: warning: argument unused during compilation: '-no-pie' [-Wunused-command-line-argument]␍
          lld: error: unable to find library -lgcc_eh␍
          lld: error: unable to find library -lgcc␍
          x86_64-w64-mingw32-gcc: error: linker command failed with exit code 1 (use -v to see invocation)␍

mingw-w64-rustup/PKGBUILD

ognevny · 2025-04-14T18:19:09Z

ahh, fails like before

error: linking with `x86_64-w64-mingw32-gcc` failed: exit code: 1
  |
  = note: "x86_64-w64-mingw32-gcc" "-fno-use-linker-plugin" "-Wl,--dynamicbase" "-Wl,--disable-auto-image-base" "-m64" "-Wl,--high-entropy-va" "<sysroot>\\lib\\rustlib\\x86_64-pc-windows-gnu\\lib\\rsbegin.o" "C:\\msys64\\tmp\\rustciR9UQD\\symbols.o" "<3 object files omitted>" "-Wl,-Bstatic" "<sysroot>\\lib\\rustlib\\x86_64-pc-windows-gnu\\lib/{libstd-*,libpanic_unwind-*,libobject-*,libmemchr-*,libaddr2line-*,libgimli-*,libwindows_targets-*,librustc_demangle-*,libstd_detect-*,libhashbrown-*,librustc_std_workspace_alloc-*,libminiz_oxide-*,libadler2-*,libunwind-*,libcfg_if-*,liblibc-*,liballoc-*,librustc_std_workspace_core-*,libcore-*,libcompiler_builtins-*}.rlib" "-Wl,-Bdynamic" "-lkernel32" "-lkernel32" "-lntdll" "-luserenv" "-lws2_32" "-ldbghelp" "-lgcc_eh" "-l:libpthread.a" "-lmsvcrt" "-lmingwex" "-lmingw32" "-lgcc" "-lmsvcrt" "-lmingwex" "-luser32" "-lkernel32" "-Wl,--nxcompat" "-o" "C:\\msys64\\home\\maksa\\forks\\500ise-MINGW\\mingw-w64-rustup\\src\\rustup-1.28.1\\target\\release\\build\\proc-macro2-06a3aa365bbe001c\\build_script_build-06a3aa365bbe001c.exe" "-Wl,--gc-sections" "-no-pie" "-Wl,--strip-debug" "-nodefaultlibs" "<sysroot>\\lib\\rustlib\\x86_64-pc-windows-gnu\\lib\\rsend.o"
  = note: some arguments are omitted. use `--verbose` to show all linker arguments
  = note: x86_64-w64-mingw32-gcc: warning: argument unused during compilation: '-no-pie' [-Wunused-command-line-argument]␍
          lld: error: unable to find library -lgcc_eh␍
          lld: error: unable to find library -lgcc␍
          x86_64-w64-mingw32-gcc: error: linker command failed with exit code 1 (use -v to see invocation)␍

it seems that having rustup here has no sense...

ognevny · 2025-04-14T18:37:22Z

(I set it to MSYS=winsymlinks:native for my personal builds).

looks like for hard links there is no difference, you don't have to set MSYS=winsymlinks:native

500-internal-server-error · 2025-04-15T12:10:45Z

ahh, fails like before

error: linking with `x86_64-w64-mingw32-gcc` failed: exit code: 1
  |
  = note: "x86_64-w64-mingw32-gcc" "-fno-use-linker-plugin" "-Wl,--dynamicbase" "-Wl,--disable-auto-image-base" "-m64" "-Wl,--high-entropy-va" "<sysroot>\\lib\\rustlib\\x86_64-pc-windows-gnu\\lib\\rsbegin.o" "C:\\msys64\\tmp\\rustciR9UQD\\symbols.o" "<3 object files omitted>" "-Wl,-Bstatic" "<sysroot>\\lib\\rustlib\\x86_64-pc-windows-gnu\\lib/{libstd-*,libpanic_unwind-*,libobject-*,libmemchr-*,libaddr2line-*,libgimli-*,libwindows_targets-*,librustc_demangle-*,libstd_detect-*,libhashbrown-*,librustc_std_workspace_alloc-*,libminiz_oxide-*,libadler2-*,libunwind-*,libcfg_if-*,liblibc-*,liballoc-*,librustc_std_workspace_core-*,libcore-*,libcompiler_builtins-*}.rlib" "-Wl,-Bdynamic" "-lkernel32" "-lkernel32" "-lntdll" "-luserenv" "-lws2_32" "-ldbghelp" "-lgcc_eh" "-l:libpthread.a" "-lmsvcrt" "-lmingwex" "-lmingw32" "-lgcc" "-lmsvcrt" "-lmingwex" "-luser32" "-lkernel32" "-Wl,--nxcompat" "-o" "C:\\msys64\\home\\maksa\\forks\\500ise-MINGW\\mingw-w64-rustup\\src\\rustup-1.28.1\\target\\release\\build\\proc-macro2-06a3aa365bbe001c\\build_script_build-06a3aa365bbe001c.exe" "-Wl,--gc-sections" "-no-pie" "-Wl,--strip-debug" "-nodefaultlibs" "<sysroot>\\lib\\rustlib\\x86_64-pc-windows-gnu\\lib\\rsend.o"
  = note: some arguments are omitted. use `--verbose` to show all linker arguments
  = note: x86_64-w64-mingw32-gcc: warning: argument unused during compilation: '-no-pie' [-Wunused-command-line-argument]␍
          lld: error: unable to find library -lgcc_eh␍
          lld: error: unable to find library -lgcc␍
          x86_64-w64-mingw32-gcc: error: linker command failed with exit code 1 (use -v to see invocation)␍

I can't reproduce this error, seems fine in CI and my local machine, where does it happen?

ognevny · 2025-04-15T12:12:24Z

probably because I added ${MINGW_PFEFIX}/bin to global $PATH. I don't know actually... my config is not clean

edit: I tried to compile rustup itself

500-internal-server-error · 2025-04-15T12:32:58Z

Hmm, CLANGARM64 CI failed instead of skipping. Though, should this package should support it? There seems to be support for arm64 msvc, but not arm64 gnu/gnullvm.

mingw-w64-rustup/PKGBUILD

ognevny · 2025-04-15T12:35:21Z

Hmm, CLANGARM64 CI failed instead of skipping. Though, should this package should support it? There seems to be support for arm64 msvc, but not arm64 gnu/gnullvm.

for MSVC target it's better to use official rustup distribution IMO

500-internal-server-error · 2025-04-15T13:00:31Z

Hmm, there a random CLANG32 CI job that still runs which causes the overall job status to fail...

ognevny · 2025-04-15T13:05:57Z

Hmm, there a random CLANG32 CI job that still runs which causes the overall job status to fail...

lol. are you sure you've rebased your branch on master?

500-internal-server-error · 2025-04-15T13:09:19Z

A bit scared since last time I did a rebase it closed my PR... but I did commit to master instead of a branch so maybe that was why.

MSYS=winsymlinks:native not needed for hard links

rustup/rustc only supports arm64 msvc anyway, but not arm64 gnu/gnullvm

mati865 · 2025-04-15T16:56:57Z

That happens when you make a mistake when rebasing and remove all the new commits. When GitHub sees a PR that brings no changes, it'll close the PR.

500-internal-server-error · 2025-04-16T04:29:05Z

Is there anything else required for this to be merged?

mingw-w64-rustup/PKGBUILD

ognevny · 2025-04-16T04:44:18Z

so, let it be an another option to use Rust here. but of course it would be better to use common Rust package instead

go2null · 2025-04-16T12:48:18Z

🙏
Thank you everyone!!
Any idea when this will be released?

ognevny · 2025-04-16T12:49:21Z

🙏
Thank you everyone!!
Any idea when this will be released?

it's already in the repo: https://packages.msys2.org/base/mingw-w64-rustup

500-internal-server-error mentioned this pull request May 24, 2024

rustup: new, 1.27.1 #20923

Closed

lazka reviewed May 26, 2024

View reviewed changes

mingw-w64-rustup/rustup-profile.sh Outdated Show resolved Hide resolved

lazka reviewed May 26, 2024

View reviewed changes

mingw-w64-rustup/PKGBUILD Outdated Show resolved Hide resolved

go2null reviewed Mar 24, 2025

View reviewed changes

mingw-w64-rustup/post.install Outdated Show resolved Hide resolved

500-internal-server-error changed the title ~~rustup: new, 1.27.1~~ rustup: new, 1.28.1 Apr 14, 2025

ognevny requested changes Apr 14, 2025

View reviewed changes

ognevny reviewed Apr 14, 2025

View reviewed changes

mingw-w64-rustup/PKGBUILD Show resolved Hide resolved

ognevny reviewed Apr 14, 2025

View reviewed changes

mingw-w64-rustup/PKGBUILD Outdated Show resolved Hide resolved

ognevny reviewed Apr 15, 2025

View reviewed changes

mingw-w64-rustup/PKGBUILD Outdated Show resolved Hide resolved

500-internal-server-error added 5 commits April 15, 2025 20:10

rustup: new package, 1.28.1

1070d19

rustup: move profile script to environment /etc

e49a077

rustup: change copies to hardlinks

88b80c0

rustup: simplify ln call

f5a7477

MSYS=winsymlinks:native not needed for hard links

rustup: remove clangarm64 support

c948530

rustup/rustc only supports arm64 msvc anyway, but not arm64 gnu/gnullvm

ognevny reviewed Apr 16, 2025

View reviewed changes

mingw-w64-rustup/PKGBUILD Outdated Show resolved Hide resolved

ognevny reviewed Apr 16, 2025

View reviewed changes

mingw-w64-rustup/PKGBUILD Outdated Show resolved Hide resolved

rustup: cleanup comments

5bc7d1d

ognevny merged commit cf3e0ca into msys2:master Apr 16, 2025
5 checks passed

500-internal-server-error mentioned this pull request Apr 16, 2025

Add rustup #16145

Closed

6 tasks

500-internal-server-error deleted the add-rustup branch April 16, 2025 05:56

Conversation

500-internal-server-error commented May 24, 2024

Uh oh!

Uh oh!

Uh oh!

ArchGuyWu commented Aug 4, 2024

Uh oh!

mati865 commented Aug 4, 2024

Uh oh!

500-internal-server-error commented Aug 4, 2024

Uh oh!

ArchGuyWu commented Aug 7, 2024

Uh oh!

Uh oh!

ognevny commented Apr 14, 2025

Uh oh!

500-internal-server-error commented Apr 14, 2025

Uh oh!

ognevny commented Apr 14, 2025

Uh oh!

ognevny left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

500-internal-server-error commented Apr 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ognevny commented Apr 14, 2025

Uh oh!

500-internal-server-error commented Apr 14, 2025

Uh oh!

ognevny commented Apr 14, 2025

Uh oh!

ognevny commented Apr 14, 2025

Uh oh!

Uh oh!

ognevny commented Apr 14, 2025

Uh oh!

ognevny commented Apr 14, 2025

Uh oh!

500-internal-server-error commented Apr 15, 2025

Uh oh!

ognevny commented Apr 15, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

500-internal-server-error commented Apr 15, 2025

Uh oh!

Uh oh!

ognevny commented Apr 15, 2025

Uh oh!

500-internal-server-error commented Apr 15, 2025

Uh oh!

ognevny commented Apr 15, 2025

Uh oh!

500-internal-server-error commented Apr 15, 2025

Uh oh!

mati865 commented Apr 15, 2025

Uh oh!

500-internal-server-error commented Apr 16, 2025

Uh oh!

Uh oh!

Uh oh!

ognevny commented Apr 16, 2025

Uh oh!

Uh oh!

go2null commented Apr 16, 2025

Uh oh!

ognevny commented Apr 16, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

500-internal-server-error commented Apr 14, 2025 •

edited

Loading

ognevny commented Apr 15, 2025 •

edited

Loading