From 88e92d473825d6ee4632dc37a226df670246a161 Mon Sep 17 00:00:00 2001 From: Jacob Heider Date: Mon, 15 Apr 2024 16:57:51 -0400 Subject: [PATCH] fix(rustup) linking to libcurl on sonoma is fraught; use `reqwest` instead. --- projects/rust-lang.org/rustup/package.yml | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/projects/rust-lang.org/rustup/package.yml b/projects/rust-lang.org/rustup/package.yml index 2bc9e5ab..44eaad36 100644 --- a/projects/rust-lang.org/rustup/package.yml +++ b/projects/rust-lang.org/rustup/package.yml @@ -6,23 +6,28 @@ versions: github: rust-lang/rustup/tags dependencies: - curl.se: '*' + linux: + curl.se: '*' openssl.org: ^1 build: dependencies: rust-lang.org/cargo: '*' freedesktop.org/pkg-config: ^0.29 - script: | - cargo run --release -- -y - mkdir -p "{{ prefix }}"/bin - mv ~/.cargo/bin/rustup "{{ prefix }}"/bin + script: + # rust/curl has issues with linking to Apple's libcurl; this manifests in + # Sonoma every time. Fortunately, rustup will use `reqwest` as a backend. + - run: sed -i -e 's/^ "curl-backend",$/ \# "curl-backend",/' Cargo.toml + if: darwin + - cargo install --locked --path . --root {{prefix}} + - run: ln -s rustup-init rustup + working-directory: ${{prefix}}/bin env: RUSTUP_INIT_SKIP_PATH_CHECK: yes provides: - bin/rustup + - bin/rustup-init test: - script: - rustup --version + script: rustup --version