FreeBSD Bugzilla – Attachment 252344 Details for
Bug 280490
lang/rust: Update to 1.80.0
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
v0
0001-lang-rust.patch (text/plain), 18.49 KB, created by
Mikael Urankar
on 2024-07-29 09:19:57 UTC
(
hide
)
Description:
v0
Filename:
MIME Type:
Creator:
Mikael Urankar
Created:
2024-07-29 09:19:57 UTC
Size:
18.49 KB
patch
obsolete
>From ddf661e6c57fc54e7c5a476514ed3825392330e8 Mon Sep 17 00:00:00 2001 >From: mikael <mikael@FreeBSD.org> >Date: Mon, 29 Jul 2024 11:17:20 +0200 >Subject: [PATCH] lang/rust: Update to 1.80.0 > >Announce: https://blog.rust-lang.org/2024/07/25/Rust-1.80.0.html >ChangeLog: https://github.com/rust-lang/rust/releases/tag/1.80.0 > >PR: XXX >Tested by: XXX > >--- > Mk/Uses/cargo.mk | 2 +- > Mk/bsd.gecko.mk | 2 +- > lang/rust-bootstrap/Makefile | 2 +- > lang/rust-bootstrap/distinfo | 6 +- > lang/rust/Makefile | 8 +- > lang/rust/distinfo | 102 +++++++++--------- > lang/rust/files/patch-vendor_cc.rs | 33 +----- > .../patch-vendor_openssl-src_src_lib.rs | 10 +- > lang/rust/update.sh | 9 +- > 9 files changed, 73 insertions(+), 101 deletions(-) > >diff --git a/Mk/Uses/cargo.mk b/Mk/Uses/cargo.mk >index be6e187e4945..17aa5ada8a59 100644 >--- a/Mk/Uses/cargo.mk >+++ b/Mk/Uses/cargo.mk >@@ -97,7 +97,7 @@ WRKSRC_crate_${_crate}= ${WRKDIR}/${_wrksrc} > > CARGO_BUILDDEP?= yes > . if ${CARGO_BUILDDEP:tl} == "yes" >-BUILD_DEPENDS+= ${RUST_DEFAULT}>=1.79.0:lang/${RUST_DEFAULT} >+BUILD_DEPENDS+= ${RUST_DEFAULT}>=1.80.0:lang/${RUST_DEFAULT} > . elif ${CARGO_BUILDDEP:tl} == "any-version" > BUILD_DEPENDS+= ${RUST_DEFAULT}>=0:lang/${RUST_DEFAULT} > . endif >diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk >index 1c650a6d6ebf..5ed7dab38997 100644 >--- a/Mk/bsd.gecko.mk >+++ b/Mk/bsd.gecko.mk >@@ -74,7 +74,7 @@ BINARY_ALIAS+= python3=${PYTHON_CMD} > BUNDLE_LIBS= yes > > BUILD_DEPENDS+= rust-cbindgen>=0.26.0:devel/rust-cbindgen \ >- ${RUST_DEFAULT}>=1.79.0:lang/${RUST_DEFAULT} \ >+ ${RUST_DEFAULT}>=1.80.0:lang/${RUST_DEFAULT} \ > node:www/node > LIB_DEPENDS+= libdrm.so:graphics/libdrm > RUN_DEPENDS+= ${LOCALBASE}/lib/libpci.so:devel/libpci >diff --git a/lang/rust-bootstrap/Makefile b/lang/rust-bootstrap/Makefile >index 8d70749ff117..3846aa32ffe4 100644 >--- a/lang/rust-bootstrap/Makefile >+++ b/lang/rust-bootstrap/Makefile >@@ -2,7 +2,7 @@ > # to upload them to ~/public_distfiles on freefall in preparation > # for the next lang/rust update. > PORTNAME= rust >-PORTVERSION= 1.79.0 >+PORTVERSION= 1.80.0 > CATEGORIES= lang > MASTER_SITES= https://static.rust-lang.org/dist/ > PKGNAMEPREFIX= ${FLAVOR:S/_/-/g}- >diff --git a/lang/rust-bootstrap/distinfo b/lang/rust-bootstrap/distinfo >index 86c3b74c7f2e..654521e92189 100644 >--- a/lang/rust-bootstrap/distinfo >+++ b/lang/rust-bootstrap/distinfo >@@ -1,3 +1,3 @@ >-TIMESTAMP = 1718102335 >-SHA256 (rust/rustc-1.79.0-src.tar.xz) = ab826e84b8d48ec6eda3370065034dea8c006f6a946d78a9ba12bcb50e6d3c7a >-SIZE (rust/rustc-1.79.0-src.tar.xz) = 162359512 >+TIMESTAMP = 1722237205 >+SHA256 (rust/rustc-1.80.0-src.tar.xz) = 0b9ca1e2e45b8a5f0b58db140af0dc92f8311faeb0ad883c5b71a72c02dc6e80 >+SIZE (rust/rustc-1.80.0-src.tar.xz) = 199187004 >diff --git a/lang/rust/Makefile b/lang/rust/Makefile >index 839cfb6c804e..9b6c5bea8cc4 100644 >--- a/lang/rust/Makefile >+++ b/lang/rust/Makefile >@@ -1,6 +1,6 @@ > PORTNAME= rust >-PORTVERSION?= 1.79.0 >-PORTREVISION?= 1 >+PORTVERSION?= 1.80.0 >+PORTREVISION?= 0 > CATEGORIES= lang > MASTER_SITES= https://static.rust-lang.org/dist/:src \ > https://dev-static.rust-lang.org/dist/:src \ >@@ -67,8 +67,8 @@ WASM_VARS= _COMPONENTS+="rust-analysis-${_PACKAGE_VERS}-wasm32-unknown-unknown > _RUST_TARGETS+=wasm32-unknown-unknown > > # See WRKSRC/src/stage0.json for the date and version values >-BOOTSTRAPS_DATE?= 2024-05-02 >-RUST_BOOTSTRAP_VERSION?= 1.78.0 >+BOOTSTRAPS_DATE?= 2024-06-13 >+RUST_BOOTSTRAP_VERSION?= 1.79.0 > > CARGO_VENDOR_DIR?= ${WRKSRC}/vendor > >diff --git a/lang/rust/distinfo b/lang/rust/distinfo >index efa253e3b729..fae0fb58b90a 100644 >--- a/lang/rust/distinfo >+++ b/lang/rust/distinfo >@@ -1,51 +1,51 @@ >-TIMESTAMP = 1718102334 >-SHA256 (rust/rustc-1.79.0-src.tar.xz) = ab826e84b8d48ec6eda3370065034dea8c006f6a946d78a9ba12bcb50e6d3c7a >-SIZE (rust/rustc-1.79.0-src.tar.xz) = 162359512 >-SHA256 (rust/2024-05-02/rustc-1.78.0-aarch64-unknown-freebsd.tar.xz) = 796e9d0ef57403682c2a1f9fc27055fd76a848fea18b2d1eef83c54224539065 >-SIZE (rust/2024-05-02/rustc-1.78.0-aarch64-unknown-freebsd.tar.xz) = 57319612 >-SHA256 (rust/2024-05-02/rust-std-1.78.0-aarch64-unknown-freebsd.tar.xz) = 43e7aad140a3bd02cca08f6c45a5baec62d5e099b6e5197703f4bf59d5cc7c5c >-SIZE (rust/2024-05-02/rust-std-1.78.0-aarch64-unknown-freebsd.tar.xz) = 25417584 >-SHA256 (rust/2024-05-02/cargo-1.78.0-aarch64-unknown-freebsd.tar.xz) = 0bf819a3eab9ec60b8a797d2c90c157135e7002502c3326c211003d6b5d1f696 >-SIZE (rust/2024-05-02/cargo-1.78.0-aarch64-unknown-freebsd.tar.xz) = 8816768 >-SHA256 (rust/2024-05-02/rustc-1.78.0-x86_64-unknown-freebsd.tar.xz) = 24c92fea05a48a16fa647c4eb79cca551b95066065ba9bcf1a41a70de418584e >-SIZE (rust/2024-05-02/rustc-1.78.0-x86_64-unknown-freebsd.tar.xz) = 46716800 >-SHA256 (rust/2024-05-02/rust-std-1.78.0-x86_64-unknown-freebsd.tar.xz) = dc31c98b26cafc76346f3dba949727a11f930fd8a543b136d845759d4b8a4c7b >-SIZE (rust/2024-05-02/rust-std-1.78.0-x86_64-unknown-freebsd.tar.xz) = 26202124 >-SHA256 (rust/2024-05-02/cargo-1.78.0-x86_64-unknown-freebsd.tar.xz) = b6eeab7031c134dad1db61551be597b463d4eb7ceb4860fcf5a83968d8c2f161 >-SIZE (rust/2024-05-02/cargo-1.78.0-x86_64-unknown-freebsd.tar.xz) = 9871768 >-SHA256 (rust/2024-05-02/rustc-1.78.0-armv7-unknown-freebsd.tar.xz) = 948cc2d0952f38315bc9d68c4f5d1bdde7f741fb56a9648a6810faf57c2c67a7 >-SIZE (rust/2024-05-02/rustc-1.78.0-armv7-unknown-freebsd.tar.xz) = 57684964 >-SHA256 (rust/2024-05-02/rust-std-1.78.0-armv7-unknown-freebsd.tar.xz) = bb9bdf1fb8dfcd7a94ddd85cacb7d01f95b9855ab1bbaf99edaa7195c04740ff >-SIZE (rust/2024-05-02/rust-std-1.78.0-armv7-unknown-freebsd.tar.xz) = 24903216 >-SHA256 (rust/2024-05-02/cargo-1.78.0-armv7-unknown-freebsd.tar.xz) = 2ac46611d5a150a243dbc303fb1e5375ef0663afa724f2bdfffa915f8c0e9a4a >-SIZE (rust/2024-05-02/cargo-1.78.0-armv7-unknown-freebsd.tar.xz) = 8884760 >-SHA256 (rust/2024-05-02/rustc-1.78.0-i686-unknown-freebsd.tar.xz) = 38b501d5b02abb94cb40c4738e01389fb6a086fc3426aee59fb9f918222ec779 >-SIZE (rust/2024-05-02/rustc-1.78.0-i686-unknown-freebsd.tar.xz) = 64399464 >-SHA256 (rust/2024-05-02/rust-std-1.78.0-i686-unknown-freebsd.tar.xz) = 53e03241d71df0db0440c716dce8d43e42b9a1ed319fbc468a3b2d0bd03676b2 >-SIZE (rust/2024-05-02/rust-std-1.78.0-i686-unknown-freebsd.tar.xz) = 26038480 >-SHA256 (rust/2024-05-02/cargo-1.78.0-i686-unknown-freebsd.tar.xz) = f75b1d7f45736a5d048e4b68e41bbe986f3f414fd8be0eb2d116133868ddb110 >-SIZE (rust/2024-05-02/cargo-1.78.0-i686-unknown-freebsd.tar.xz) = 10154936 >-SHA256 (rust/2024-05-02/rustc-1.78.0-powerpc-unknown-freebsd.tar.xz) = dbe7c32f49be34098eb1199e3ce2e3cef748fc0a7339448aa258c7f4e41f9d1a >-SIZE (rust/2024-05-02/rustc-1.78.0-powerpc-unknown-freebsd.tar.xz) = 61054892 >-SHA256 (rust/2024-05-02/rust-std-1.78.0-powerpc-unknown-freebsd.tar.xz) = f130932c829c88064b89de7b511cacfa4d49273339a325e73f4f83b55592a764 >-SIZE (rust/2024-05-02/rust-std-1.78.0-powerpc-unknown-freebsd.tar.xz) = 24067100 >-SHA256 (rust/2024-05-02/cargo-1.78.0-powerpc-unknown-freebsd.tar.xz) = 76b93267895bf2f6fc24c6b46e68a6593a8d065545b0d46afeaddb4f9eda5615 >-SIZE (rust/2024-05-02/cargo-1.78.0-powerpc-unknown-freebsd.tar.xz) = 9564996 >-SHA256 (rust/2024-05-02/rustc-1.78.0-powerpc64-unknown-freebsd.tar.xz) = dac918f38b284d62eca95df2b29bbfb6eb6c8e8419bf57ac669f8b181def737a >-SIZE (rust/2024-05-02/rustc-1.78.0-powerpc64-unknown-freebsd.tar.xz) = 59532620 >-SHA256 (rust/2024-05-02/rust-std-1.78.0-powerpc64-unknown-freebsd.tar.xz) = 9eebd51b38a3a24ae57cec39b7368c2c1b30fc67c8d651d0829a752976d49158 >-SIZE (rust/2024-05-02/rust-std-1.78.0-powerpc64-unknown-freebsd.tar.xz) = 24058796 >-SHA256 (rust/2024-05-02/cargo-1.78.0-powerpc64-unknown-freebsd.tar.xz) = 24ee0edbed6147aedd7d0d7d5f10774c59b3eefeabdbb20adca826ab79a7b608 >-SIZE (rust/2024-05-02/cargo-1.78.0-powerpc64-unknown-freebsd.tar.xz) = 9137688 >-SHA256 (rust/2024-05-02/rustc-1.78.0-powerpc64le-unknown-freebsd.tar.xz) = a9e26efd3362b129d2002d6a629bc94abeadc721a776192887e13af78fd35738 >-SIZE (rust/2024-05-02/rustc-1.78.0-powerpc64le-unknown-freebsd.tar.xz) = 60918936 >-SHA256 (rust/2024-05-02/rust-std-1.78.0-powerpc64le-unknown-freebsd.tar.xz) = 00a49af7bc1dc16ec18eec34b71055d6d42923220569c06d27ed3b5e0e5c4589 >-SIZE (rust/2024-05-02/rust-std-1.78.0-powerpc64le-unknown-freebsd.tar.xz) = 24168348 >-SHA256 (rust/2024-05-02/cargo-1.78.0-powerpc64le-unknown-freebsd.tar.xz) = 79b6a00f2ea9fb88506dfefb057bd9b8abdbb01f9cf2fefe7c1dc3f146d9edc3 >-SIZE (rust/2024-05-02/cargo-1.78.0-powerpc64le-unknown-freebsd.tar.xz) = 9372912 >-SHA256 (rust/2024-05-02/rustc-1.78.0-riscv64gc-unknown-freebsd.tar.xz) = 21f1e2f76501717810043e907ca7192447f010a0562d9a52253176a8655b3cf5 >-SIZE (rust/2024-05-02/rustc-1.78.0-riscv64gc-unknown-freebsd.tar.xz) = 76153676 >-SHA256 (rust/2024-05-02/rust-std-1.78.0-riscv64gc-unknown-freebsd.tar.xz) = 73d1645a06c4f2f8ad2462ba04878f6b8f0b7d93da1e562b4428a5e23c34cefb >-SIZE (rust/2024-05-02/rust-std-1.78.0-riscv64gc-unknown-freebsd.tar.xz) = 24204228 >-SHA256 (rust/2024-05-02/cargo-1.78.0-riscv64gc-unknown-freebsd.tar.xz) = b547ef7ae9d701b9bc618165f9882e3e40d2db74f6cb70a12a4b6b4ebaf2b414 >-SIZE (rust/2024-05-02/cargo-1.78.0-riscv64gc-unknown-freebsd.tar.xz) = 13083732 >+TIMESTAMP = 1722243051 >+SHA256 (rust/rustc-1.80.0-src.tar.xz) = 0b9ca1e2e45b8a5f0b58db140af0dc92f8311faeb0ad883c5b71a72c02dc6e80 >+SIZE (rust/rustc-1.80.0-src.tar.xz) = 199187004 >+SHA256 (rust/2024-06-13/rustc-1.79.0-aarch64-unknown-freebsd.tar.xz) = 9d41e18a04fa4cf5f89b62c8abbef5d37cd5c5fd8bd686c6edfce147afc5860f >+SIZE (rust/2024-06-13/rustc-1.79.0-aarch64-unknown-freebsd.tar.xz) = 58112464 >+SHA256 (rust/2024-06-13/rust-std-1.79.0-aarch64-unknown-freebsd.tar.xz) = 77a5222238a02e8cc5f25964b5affea79e7d01b023789181053df142400822bd >+SIZE (rust/2024-06-13/rust-std-1.79.0-aarch64-unknown-freebsd.tar.xz) = 25556868 >+SHA256 (rust/2024-06-13/cargo-1.79.0-aarch64-unknown-freebsd.tar.xz) = ba5e189d0e3f8a5cd26ed43e477e7db9c269e34fda71eb0a010cda6470eecef6 >+SIZE (rust/2024-06-13/cargo-1.79.0-aarch64-unknown-freebsd.tar.xz) = 9064160 >+SHA256 (rust/2024-06-13/rustc-1.79.0-x86_64-unknown-freebsd.tar.xz) = a554b8de90775224f24b96889673da4d5916c079c7d314c83b26e81887ba60a6 >+SIZE (rust/2024-06-13/rustc-1.79.0-x86_64-unknown-freebsd.tar.xz) = 47306168 >+SHA256 (rust/2024-06-13/rust-std-1.79.0-x86_64-unknown-freebsd.tar.xz) = 74eb3078e0f9ac4db7dd8098897190532d59e735d5b8db47d1f61194d1c8b30a >+SIZE (rust/2024-06-13/rust-std-1.79.0-x86_64-unknown-freebsd.tar.xz) = 26308144 >+SHA256 (rust/2024-06-13/cargo-1.79.0-x86_64-unknown-freebsd.tar.xz) = 0c125f252f8fbcf322db236c86c0198059b73c489fb404fa5956e1b8785803b5 >+SIZE (rust/2024-06-13/cargo-1.79.0-x86_64-unknown-freebsd.tar.xz) = 10071224 >+SHA256 (rust/2024-06-13/rustc-1.79.0-armv7-unknown-freebsd.tar.xz) = f383b6affbbf1165d921f775ce1a3181403e91d73906cea7e060fcaa67407751 >+SIZE (rust/2024-06-13/rustc-1.79.0-armv7-unknown-freebsd.tar.xz) = 58252988 >+SHA256 (rust/2024-06-13/rust-std-1.79.0-armv7-unknown-freebsd.tar.xz) = f9723e91942cac08a5708149ada169f2f1557d9ae55d5608947b61f8c5b3de99 >+SIZE (rust/2024-06-13/rust-std-1.79.0-armv7-unknown-freebsd.tar.xz) = 25099432 >+SHA256 (rust/2024-06-13/cargo-1.79.0-armv7-unknown-freebsd.tar.xz) = 8dc712aace1f5f7c4244004d49d363da590b10bfc867460667dfab7b2ea8f93a >+SIZE (rust/2024-06-13/cargo-1.79.0-armv7-unknown-freebsd.tar.xz) = 9084000 >+SHA256 (rust/2024-06-13/rustc-1.79.0-i686-unknown-freebsd.tar.xz) = 54f647fb589ed7c60121c0ea9db9e2e49cae718ebabedecf521926faed011f72 >+SIZE (rust/2024-06-13/rustc-1.79.0-i686-unknown-freebsd.tar.xz) = 64564744 >+SHA256 (rust/2024-06-13/rust-std-1.79.0-i686-unknown-freebsd.tar.xz) = 3ab8428455e017844b6d96b7ca1302d3d4f6e40772e710ec8bb51bd78a68b26c >+SIZE (rust/2024-06-13/rust-std-1.79.0-i686-unknown-freebsd.tar.xz) = 26080684 >+SHA256 (rust/2024-06-13/cargo-1.79.0-i686-unknown-freebsd.tar.xz) = 61c0de5b2f1e75244f7752a8a647c26a7ff9a7a02d77c26da8fa038ad15e77a7 >+SIZE (rust/2024-06-13/cargo-1.79.0-i686-unknown-freebsd.tar.xz) = 10455488 >+SHA256 (rust/2024-06-13/rustc-1.79.0-powerpc-unknown-freebsd.tar.xz) = b329fc7ba0222114a6c27626b39aaad479aae9752778d48e82c1b288eef38659 >+SIZE (rust/2024-06-13/rustc-1.79.0-powerpc-unknown-freebsd.tar.xz) = 61616216 >+SHA256 (rust/2024-06-13/rust-std-1.79.0-powerpc-unknown-freebsd.tar.xz) = cc51406487b879c653c533db6e0dc6597ee9228a88c1c9d1a09f066dbbaebbe9 >+SIZE (rust/2024-06-13/rust-std-1.79.0-powerpc-unknown-freebsd.tar.xz) = 24223360 >+SHA256 (rust/2024-06-13/cargo-1.79.0-powerpc-unknown-freebsd.tar.xz) = 5be8e77bdbfc791824dd9f5f59a3233fe135c451fee37bad795952164b9d7177 >+SIZE (rust/2024-06-13/cargo-1.79.0-powerpc-unknown-freebsd.tar.xz) = 9710464 >+SHA256 (rust/2024-06-13/rustc-1.79.0-powerpc64-unknown-freebsd.tar.xz) = 30240605e2e36706b2a5f603a4431645855c034e146c68fc720c242c210a4982 >+SIZE (rust/2024-06-13/rustc-1.79.0-powerpc64-unknown-freebsd.tar.xz) = 59944004 >+SHA256 (rust/2024-06-13/rust-std-1.79.0-powerpc64-unknown-freebsd.tar.xz) = 7b135647ab38adf9feb82249b4ea3b51510f913b967839aa00c538dcbd5a27e0 >+SIZE (rust/2024-06-13/rust-std-1.79.0-powerpc64-unknown-freebsd.tar.xz) = 24240820 >+SHA256 (rust/2024-06-13/cargo-1.79.0-powerpc64-unknown-freebsd.tar.xz) = 61d4c7c855c46c9c17cd9a9cec8da276e12ee44eb69cfdb2f5a566f837e1ca89 >+SIZE (rust/2024-06-13/cargo-1.79.0-powerpc64-unknown-freebsd.tar.xz) = 9363860 >+SHA256 (rust/2024-06-13/rustc-1.79.0-powerpc64le-unknown-freebsd.tar.xz) = e53110045852b301724849befa9d9c1075be2604b60b78ee059ab6bad11b5115 >+SIZE (rust/2024-06-13/rustc-1.79.0-powerpc64le-unknown-freebsd.tar.xz) = 61601448 >+SHA256 (rust/2024-06-13/rust-std-1.79.0-powerpc64le-unknown-freebsd.tar.xz) = 1ab10291b3593ecc792ef2bb0959deedbfabb5bff0f999b2425d70694a5be851 >+SIZE (rust/2024-06-13/rust-std-1.79.0-powerpc64le-unknown-freebsd.tar.xz) = 24316744 >+SHA256 (rust/2024-06-13/cargo-1.79.0-powerpc64le-unknown-freebsd.tar.xz) = 0a69abcb3462da593662c7a7dca9593b3dd79ffa55c32d7139a510458d51bd95 >+SIZE (rust/2024-06-13/cargo-1.79.0-powerpc64le-unknown-freebsd.tar.xz) = 9617256 >+SHA256 (rust/2024-06-13/rustc-1.79.0-riscv64gc-unknown-freebsd.tar.xz) = 69ff7bb00195679a83e796b7cbf2c58940c26c63ad8094f527cae140d04015ee >+SIZE (rust/2024-06-13/rustc-1.79.0-riscv64gc-unknown-freebsd.tar.xz) = 68491292 >+SHA256 (rust/2024-06-13/rust-std-1.79.0-riscv64gc-unknown-freebsd.tar.xz) = 3462157b36db5b43d0c3c59704f648f03b8b6811d17136dcda0da1cf60f27df9 >+SIZE (rust/2024-06-13/rust-std-1.79.0-riscv64gc-unknown-freebsd.tar.xz) = 24204772 >+SHA256 (rust/2024-06-13/cargo-1.79.0-riscv64gc-unknown-freebsd.tar.xz) = 44a1c32552f009514e6b88b79db1f24c74d587ef175a386a7fd67b1ae1947dab >+SIZE (rust/2024-06-13/cargo-1.79.0-riscv64gc-unknown-freebsd.tar.xz) = 11880636 >diff --git a/lang/rust/files/patch-vendor_cc.rs b/lang/rust/files/patch-vendor_cc.rs >index 5b6888c4c087..f12948036741 100644 >--- a/lang/rust/files/patch-vendor_cc.rs >+++ b/lang/rust/files/patch-vendor_cc.rs >@@ -8,35 +8,6 @@ until LLVM can be updated to use libc++ by default. > > https://reviews.llvm.org/D77776 > >---- vendor/cc-1.0.73/src/lib.rs.orig 2021-03-04 20:58:54 UTC >-+++ vendor/cc-1.0.73/src/lib.rs >-@@ -2659,24 +2659,7 @@ impl Tool { >- } >- >- fn with_features(path: PathBuf, clang_driver: Option<&str>, cuda: bool) -> Self { >-- // Try to detect family of the tool from its name, falling back to Gnu. >-- let family = if let Some(fname) = path.file_name().and_then(|p| p.to_str()) { >-- if fname.contains("clang-cl") { >-- ToolFamily::Msvc { clang_cl: true } >-- } else if fname.ends_with("cl") || fname == "cl.exe" { >-- ToolFamily::Msvc { clang_cl: false } >-- } else if fname.contains("clang") { >-- match clang_driver { >-- Some("cl") => ToolFamily::Msvc { clang_cl: true }, >-- _ => ToolFamily::Clang, >-- } >-- } else { >-- ToolFamily::Gnu >-- } >-- } else { >-- ToolFamily::Gnu >-- }; >-- >-+ let family = ToolFamily::Gnu; >- Tool { >- path: path, >- cc_wrapper_path: None, >- > --- vendor/cc-1.0.79/src/lib.rs.orig 2021-03-04 20:58:54 UTC > +++ vendor/cc-1.0.79/src/lib.rs > @@ -2659,24 +2659,7 @@ impl Tool { >@@ -92,8 +63,8 @@ https://reviews.llvm.org/D77776 > > Tool { > path, >---- vendor/cc-1.0.92/src/tool.rs.orig 2024-05-09 18:20:47 UTC >-+++ vendor/cc-1.0.92/src/tool.rs >+--- vendor/cc-1.0.97/src/tool.rs.orig 2024-05-09 18:20:47 UTC >++++ vendor/cc-1.0.97/src/tool.rs > @@ -151,9 +151,7 @@ impl Tool { > > match (clang, accepts_cl_style_flags, gcc) { >diff --git a/lang/rust/files/riscv64/patch-vendor_openssl-src_src_lib.rs b/lang/rust/files/riscv64/patch-vendor_openssl-src_src_lib.rs >index c7fd8cb30f49..755907739e36 100644 >--- a/lang/rust/files/riscv64/patch-vendor_openssl-src_src_lib.rs >+++ b/lang/rust/files/riscv64/patch-vendor_openssl-src_src_lib.rs >@@ -1,10 +1,10 @@ >---- vendor/openssl-src-111.28.1+1.1.1w/src/lib.rs.orig 2021-11-04 11:27:54 UTC >-+++ vendor/openssl-src-111.28.1+1.1.1w/src/lib.rs >-@@ -260,6 +260,7 @@ impl Build { >- "powerpc64le-unknown-freebsd" => "BSD-generic64", >+--- vendor/openssl-src-111.28.2+1.1.1w/src/lib.rs.orig 2021-11-04 11:27:54 UTC >++++ vendor/openssl-src-111.28.2+1.1.1w/src/lib.rs >+@@ -284,6 +284,7 @@ impl Build { > "powerpc64le-unknown-linux-gnu" => "linux-ppc64le", > "powerpc64le-unknown-linux-musl" => "linux-ppc64le", >-+ "riscv64gc-unknown-freebsd" => "BSD-generic64", > "riscv64gc-unknown-linux-gnu" => "linux-generic64", >++ "riscv64gc-unknown-freebsd" => "BSD-generic64", > "s390x-unknown-linux-gnu" => "linux64-s390x", > "s390x-unknown-linux-musl" => "linux64-s390x", >+ "x86_64-apple-darwin" => "darwin64-x86_64-cc", >diff --git a/lang/rust/update.sh b/lang/rust/update.sh >index 80b8da99b5c3..f169891c53d7 100644 >--- a/lang/rust/update.sh >+++ b/lang/rust/update.sh >@@ -8,10 +8,11 @@ version=$(</tmp/channel-rust-stable.toml tomlq -r '.pkg.rustc.version | split(" > new_commit=$(</tmp/channel-rust-stable.toml tomlq -r '.pkg.rustc.git_commit_hash') > rm /tmp/channel-rust-stable.toml > >-fetch -qo - https://raw.githubusercontent.com/rust-lang/rust/${new_commit}/src/stage0.json | jq -r ' >- "BOOTSTRAPS_DATE=\(.compiler.date)", >- "RUST_BOOTSTRAP_VERSION=\(.compiler.version)" >-' | portedit merge -i . >+fetch -qo /tmp/stage0 https://raw.githubusercontent.com/rust-lang/rust/${new_commit}/src/stage0 >+BOOTSTRAPS_DATE=$(awk -F "=" /^compiler_date/'{print $2}' /tmp/stage0) >+RUST_BOOTSTRAP_VERSION=$(awk -F "=" /^compiler_version/'{print $2}' /tmp/stage0) >+echo "BOOTSTRAPS_DATE=${BOOTSTRAPS_DATE}" | portedit merge -i . >+echo "RUST_BOOTSTRAP_VERSION=${RUST_BOOTSTRAP_VERSION}" | portedit merge -i . > > cat <<EOF | sed -i '' -E -f - ../../Mk/Uses/cargo.mk ../../Mk/bsd.gecko.mk > 1,/\\$\\{RUST_DEFAULT\\}>=/ { >-- >2.45.2 >
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=252344">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 280490
:
252344
|
252345
|
253039