From 53deffeeca77c0c9bb53f788809b130933850de6 Mon Sep 17 00:00:00 2001 From: Ruoyu Zhong Date: Thu, 13 Jul 2023 22:17:12 +0800 Subject: [PATCH 1/2] rust 1.71.0 Also: - avoid mixing CLT and Xcode headers; - force Cargo resource installation to avoid error. --- Formula/rust.rb | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/Formula/rust.rb b/Formula/rust.rb index 423f748d53988..967cfa74297ba 100644 --- a/Formula/rust.rb +++ b/Formula/rust.rb @@ -4,14 +4,14 @@ class Rust < Formula license any_of: ["Apache-2.0", "MIT"] stable do - url "https://static.rust-lang.org/dist/rustc-1.70.0-src.tar.gz" - sha256 "b2bfae000b7a5040e4ec4bbc50a09f21548190cb7570b0ed77358368413bd27c" + url "https://static.rust-lang.org/dist/rustc-1.71.0-src.tar.gz" + sha256 "a667e4abdc5588ebfea35c381e319d840ffbf8d2dbfb79771730573642034c96" # From https://github.com/rust-lang/rust/tree/#{version}/src/tools resource "cargo" do url "https://github.com/rust-lang/cargo.git", - tag: "0.71.0", - revision: "ec8a8a0cabb0e0cadef58902470f6c7ee7868bdc" + tag: "0.72.0", + revision: "cfd3bbd8fe4fd92074dfad04b7eb9a923646839f" end end @@ -46,24 +46,24 @@ class Rust < Formula on_macos do # From https://github.com/rust-lang/rust/blob/#{version}/src/stage0.json on_arm do - url "https://static.rust-lang.org/dist/2023-04-20/cargo-1.69.0-aarch64-apple-darwin.tar.gz" - sha256 "b185ea41a0ad76ac23b08744732c51e4811528291f7193d612a42e3e54ecd535" + url "https://static.rust-lang.org/dist/2023-06-01/cargo-1.70.0-aarch64-apple-darwin.tar.xz" + sha256 "faa0c57eab1846f4220e0833a167b845799bfc2d43aee819db7e9f5fe7d5a031" end on_intel do - url "https://static.rust-lang.org/dist/2023-04-20/cargo-1.69.0-x86_64-apple-darwin.tar.gz" - sha256 "3ed0b5eaaf7e908f196b4882aad757cb2a623ca3c8e8e74471422df5e93ebfb0" + url "https://static.rust-lang.org/dist/2023-06-01/cargo-1.70.0-x86_64-apple-darwin.tar.xz" + sha256 "0aa4661564be110614874812891d29b327eb343d2eb1eaf9862438aa2436f6b5" end end on_linux do # From: https://github.com/rust-lang/rust/blob/#{version}/src/stage0.json on_arm do - url "https://static.rust-lang.org/dist/2023-04-20/cargo-1.69.0-aarch64-unknown-linux-gnu.tar.gz" - sha256 "6ba6e4a9295b03d01b7dac94b7941d71c029343dc3abfd6cc4733a99fc3c7976" + url "https://static.rust-lang.org/dist/2023-06-01/cargo-1.70.0-aarch64-unknown-linux-gnu.tar.xz" + sha256 "8fd2d9806f0601feab1485f79e46d1441af2158c68abf56788ff355d5c6b4ab5" end on_intel do - url "https://static.rust-lang.org/dist/2023-04-20/cargo-1.69.0-x86_64-unknown-linux-gnu.tar.gz" - sha256 "7ee899206f592a86687478465970aa6b57772ccbe9a1f1b7695aa1237c2325a6" + url "https://static.rust-lang.org/dist/2023-06-01/cargo-1.70.0-x86_64-unknown-linux-gnu.tar.xz" + sha256 "650e7a890a52869cd14e2305652bff775aec7fc2cf47fc62cf4a89ff07242333" end end end @@ -75,7 +75,7 @@ def install # https://crates.io/crates/openssl#manual-configuration ENV["OPENSSL_DIR"] = Formula["openssl@3"].opt_prefix - if OS.mac? && MacOS.version <= :sierra + if OS.mac? # Requires the CLT to be the active developer directory if Xcode is installed ENV["SDKROOT"] = MacOS.sdk_path # Fix build failure for compiler_builtins "error: invalid deployment target @@ -102,7 +102,7 @@ def install resource("cargo").stage do ENV["RUSTC"] = bin/"rustc" - args = %W[--root #{prefix} --path .] + args = %W[--root #{prefix} --path . --force] args += %w[--features curl-sys/force-system-lib-on-osx] if OS.mac? system "cargo", "install", *args man1.install Dir["src/etc/man/*.1"] From dcc870c7cf28f054d8e52d8fdbb92a381cb02d86 Mon Sep 17 00:00:00 2001 From: BrewTestBot <1589480+BrewTestBot@users.noreply.github.com> Date: Wed, 26 Jul 2023 15:17:25 +0000 Subject: [PATCH 2/2] rust: update 1.71.0 bottle. --- Formula/rust.rb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Formula/rust.rb b/Formula/rust.rb index 967cfa74297ba..ac91b09aa83f8 100644 --- a/Formula/rust.rb +++ b/Formula/rust.rb @@ -16,13 +16,13 @@ class Rust < Formula end bottle do - sha256 cellar: :any, arm64_ventura: "7900bfec5d332b5fd8d14eef924331bff0f5714bbf05e01d66f9ce4df7538fa8" - sha256 cellar: :any, arm64_monterey: "e47d95b3b0cb6225e2eec489cfd30b422685d836336a5f033a25ba55e8452233" - sha256 cellar: :any, arm64_big_sur: "54268d4eb9665230c19d46e223a5af4bc1d92367e9b9f4e191f6761fde8017af" - sha256 cellar: :any, ventura: "6dbc9cc7cfcf9da9557f508476784d029e1bd873b28896830c60a8f67b1c4933" - sha256 cellar: :any, monterey: "f15a43989ca9b66f5495c4b7f8cc06e70ff7b225076ad0c65ed1b6b7186de632" - sha256 cellar: :any, big_sur: "dd43d88867d3c8b2e2a88951b07e7bfcaa9d4de91fb65bbe5a893dabfd1d8b31" - sha256 cellar: :any_skip_relocation, x86_64_linux: "20bd507ead0248ace9af329ca9a3bb3e59a62feb67092bf50ef9f0416615f397" + sha256 cellar: :any, arm64_ventura: "6d3c3af59119378b1834dd1e2a8305ed112495d57752c8121a316494879b32c9" + sha256 cellar: :any, arm64_monterey: "e9129363c876ab1e895a4d43b4c5522a993311a0110b99ac98a4d33565ff5f91" + sha256 cellar: :any, arm64_big_sur: "e555d0975215ee1463f6054433ce46efd44df6ac24b764c943c7a6de63b9309e" + sha256 cellar: :any, ventura: "157c9336adb9c0610464e97c0e7a87e8befd311b5eef005baee4f23d06c217be" + sha256 cellar: :any, monterey: "4e8338719bd8480e7252fa8403588ce115707e863444b38d2f3efd0cc07aa5b3" + sha256 cellar: :any, big_sur: "8dd7e892b5626872be4c19fb7b9f17ea377e1217cc907bf343f4f32efd30f418" + sha256 cellar: :any_skip_relocation, x86_64_linux: "91ba09bd1a47c20decf9540f1352ea49287b79106fc407074985536c48e5a03a" end head do