Attachment #252344 for bug #280490

Lines 97-103 WRKSRC_crate_${_crate}= ${WRKDIR}/${_wrksrc} Link Here

(-)b/Mk/Uses/cargo.mk (-1 / +1 lines)
97		97
98	CARGO_BUILDDEP?= yes	98	CARGO_BUILDDEP?= yes
99	. if ${CARGO_BUILDDEP:tl} == "yes"	99	. if ${CARGO_BUILDDEP:tl} == "yes"
100	BUILD_DEPENDS+= ${RUST_DEFAULT}>=1.79.0:lang/${RUST_DEFAULT}	100	BUILD_DEPENDS+= ${RUST_DEFAULT}>=1.80.0:lang/${RUST_DEFAULT}
101	. elif ${CARGO_BUILDDEP:tl} == "any-version"	101	. elif ${CARGO_BUILDDEP:tl} == "any-version"
102	BUILD_DEPENDS+= ${RUST_DEFAULT}>=0:lang/${RUST_DEFAULT}	102	BUILD_DEPENDS+= ${RUST_DEFAULT}>=0:lang/${RUST_DEFAULT}
103	. endif	103	. endif

Lines 74-80 BINARY_ALIAS+= python3=${PYTHON_CMD} Link Here

(-)b/Mk/bsd.gecko.mk (-1 / +1 lines)
74	BUNDLE_LIBS= yes	74	BUNDLE_LIBS= yes
75		75
76	BUILD_DEPENDS+= rust-cbindgen>=0.26.0:devel/rust-cbindgen \	76	BUILD_DEPENDS+= rust-cbindgen>=0.26.0:devel/rust-cbindgen \
77	${RUST_DEFAULT}>=1.79.0:lang/${RUST_DEFAULT} \	77	${RUST_DEFAULT}>=1.80.0:lang/${RUST_DEFAULT} \
78	node:www/node	78	node:www/node
79	LIB_DEPENDS+= libdrm.so:graphics/libdrm	79	LIB_DEPENDS+= libdrm.so:graphics/libdrm
80	RUN_DEPENDS+= ${LOCALBASE}/lib/libpci.so:devel/libpci	80	RUN_DEPENDS+= ${LOCALBASE}/lib/libpci.so:devel/libpci

Lines 2-8 Link Here

(-)b/lang/rust-bootstrap/Makefile (-1 / +1 lines)
2	# to upload them to ~/public_distfiles on freefall in preparation	2	# to upload them to ~/public_distfiles on freefall in preparation
3	# for the next lang/rust update.	3	# for the next lang/rust update.
4	PORTNAME= rust	4	PORTNAME= rust
5	PORTVERSION= 1.79.0	5	PORTVERSION= 1.80.0
6	CATEGORIES= lang	6	CATEGORIES= lang
7	MASTER_SITES= https://static.rust-lang.org/dist/	7	MASTER_SITES= https://static.rust-lang.org/dist/
8	PKGNAMEPREFIX= ${FLAVOR:S/_/-/g}-	8	PKGNAMEPREFIX= ${FLAVOR:S/_/-/g}-

Lines 1-3 Link Here

(-)b/lang/rust-bootstrap/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1718102335	1	TIMESTAMP = 1722237205
2	SHA256 (rust/rustc-1.79.0-src.tar.xz) = ab826e84b8d48ec6eda3370065034dea8c006f6a946d78a9ba12bcb50e6d3c7a	2	SHA256 (rust/rustc-1.80.0-src.tar.xz) = 0b9ca1e2e45b8a5f0b58db140af0dc92f8311faeb0ad883c5b71a72c02dc6e80
3	SIZE (rust/rustc-1.79.0-src.tar.xz) = 162359512	3	SIZE (rust/rustc-1.80.0-src.tar.xz) = 199187004

Lines 1-6 Link Here

(-)b/lang/rust/Makefile (-4 / +4 lines)
1	PORTNAME= rust	1	PORTNAME= rust
2	PORTVERSION?= 1.79.0	2	PORTVERSION?= 1.80.0
3	PORTREVISION?= 1	3	PORTREVISION?= 0
4	CATEGORIES= lang	4	CATEGORIES= lang
5	MASTER_SITES= https://static.rust-lang.org/dist/:src \	5	MASTER_SITES= https://static.rust-lang.org/dist/:src \
6	https://dev-static.rust-lang.org/dist/:src \	6	https://dev-static.rust-lang.org/dist/:src \
Lines 67-74 WASM_VARS= _COMPONENTS+="rust-analysis-${_PACKAGE_VERS}-wasm32-unknown-unknown Link Here
67	_RUST_TARGETS+=wasm32-unknown-unknown	67	_RUST_TARGETS+=wasm32-unknown-unknown
68		68
69	# See WRKSRC/src/stage0.json for the date and version values	69	# See WRKSRC/src/stage0.json for the date and version values
70	BOOTSTRAPS_DATE?= 2024-05-02	70	BOOTSTRAPS_DATE?= 2024-06-13
71	RUST_BOOTSTRAP_VERSION?= 1.78.0	71	RUST_BOOTSTRAP_VERSION?= 1.79.0
72		72
73	CARGO_VENDOR_DIR?= ${WRKSRC}/vendor	73	CARGO_VENDOR_DIR?= ${WRKSRC}/vendor
74		74




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





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 {

 
         Tool {
             path,
--- 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) {




--- 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-freebsd" => "BSD-generic64",
             "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",




new_commit=$(</tmp/channel-rust-stable.toml tomlq -r '.pkg.rustc.git_commit_hash')
rm /tmp/channel-rust-stable.toml

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\\}>=/ {
- 

Return to bug 280490

Lines 1-51 Link Here

(-)b/lang/rust/distinfo (-51 / +51 lines)
1	TIMESTAMP = 1718102334	1	TIMESTAMP = 1722243051
2	SHA256 (rust/rustc-1.79.0-src.tar.xz) = ab826e84b8d48ec6eda3370065034dea8c006f6a946d78a9ba12bcb50e6d3c7a	2	SHA256 (rust/rustc-1.80.0-src.tar.xz) = 0b9ca1e2e45b8a5f0b58db140af0dc92f8311faeb0ad883c5b71a72c02dc6e80
3	SIZE (rust/rustc-1.79.0-src.tar.xz) = 162359512	3	SIZE (rust/rustc-1.80.0-src.tar.xz) = 199187004
4	SHA256 (rust/2024-05-02/rustc-1.78.0-aarch64-unknown-freebsd.tar.xz) = 796e9d0ef57403682c2a1f9fc27055fd76a848fea18b2d1eef83c54224539065	4	SHA256 (rust/2024-06-13/rustc-1.79.0-aarch64-unknown-freebsd.tar.xz) = 9d41e18a04fa4cf5f89b62c8abbef5d37cd5c5fd8bd686c6edfce147afc5860f
5	SIZE (rust/2024-05-02/rustc-1.78.0-aarch64-unknown-freebsd.tar.xz) = 57319612	5	SIZE (rust/2024-06-13/rustc-1.79.0-aarch64-unknown-freebsd.tar.xz) = 58112464
6	SHA256 (rust/2024-05-02/rust-std-1.78.0-aarch64-unknown-freebsd.tar.xz) = 43e7aad140a3bd02cca08f6c45a5baec62d5e099b6e5197703f4bf59d5cc7c5c	6	SHA256 (rust/2024-06-13/rust-std-1.79.0-aarch64-unknown-freebsd.tar.xz) = 77a5222238a02e8cc5f25964b5affea79e7d01b023789181053df142400822bd
7	SIZE (rust/2024-05-02/rust-std-1.78.0-aarch64-unknown-freebsd.tar.xz) = 25417584	7	SIZE (rust/2024-06-13/rust-std-1.79.0-aarch64-unknown-freebsd.tar.xz) = 25556868
8	SHA256 (rust/2024-05-02/cargo-1.78.0-aarch64-unknown-freebsd.tar.xz) = 0bf819a3eab9ec60b8a797d2c90c157135e7002502c3326c211003d6b5d1f696	8	SHA256 (rust/2024-06-13/cargo-1.79.0-aarch64-unknown-freebsd.tar.xz) = ba5e189d0e3f8a5cd26ed43e477e7db9c269e34fda71eb0a010cda6470eecef6
9	SIZE (rust/2024-05-02/cargo-1.78.0-aarch64-unknown-freebsd.tar.xz) = 8816768	9	SIZE (rust/2024-06-13/cargo-1.79.0-aarch64-unknown-freebsd.tar.xz) = 9064160
10	SHA256 (rust/2024-05-02/rustc-1.78.0-x86_64-unknown-freebsd.tar.xz) = 24c92fea05a48a16fa647c4eb79cca551b95066065ba9bcf1a41a70de418584e	10	SHA256 (rust/2024-06-13/rustc-1.79.0-x86_64-unknown-freebsd.tar.xz) = a554b8de90775224f24b96889673da4d5916c079c7d314c83b26e81887ba60a6
11	SIZE (rust/2024-05-02/rustc-1.78.0-x86_64-unknown-freebsd.tar.xz) = 46716800	11	SIZE (rust/2024-06-13/rustc-1.79.0-x86_64-unknown-freebsd.tar.xz) = 47306168
12	SHA256 (rust/2024-05-02/rust-std-1.78.0-x86_64-unknown-freebsd.tar.xz) = dc31c98b26cafc76346f3dba949727a11f930fd8a543b136d845759d4b8a4c7b	12	SHA256 (rust/2024-06-13/rust-std-1.79.0-x86_64-unknown-freebsd.tar.xz) = 74eb3078e0f9ac4db7dd8098897190532d59e735d5b8db47d1f61194d1c8b30a
13	SIZE (rust/2024-05-02/rust-std-1.78.0-x86_64-unknown-freebsd.tar.xz) = 26202124	13	SIZE (rust/2024-06-13/rust-std-1.79.0-x86_64-unknown-freebsd.tar.xz) = 26308144
14	SHA256 (rust/2024-05-02/cargo-1.78.0-x86_64-unknown-freebsd.tar.xz) = b6eeab7031c134dad1db61551be597b463d4eb7ceb4860fcf5a83968d8c2f161	14	SHA256 (rust/2024-06-13/cargo-1.79.0-x86_64-unknown-freebsd.tar.xz) = 0c125f252f8fbcf322db236c86c0198059b73c489fb404fa5956e1b8785803b5
15	SIZE (rust/2024-05-02/cargo-1.78.0-x86_64-unknown-freebsd.tar.xz) = 9871768	15	SIZE (rust/2024-06-13/cargo-1.79.0-x86_64-unknown-freebsd.tar.xz) = 10071224
16	SHA256 (rust/2024-05-02/rustc-1.78.0-armv7-unknown-freebsd.tar.xz) = 948cc2d0952f38315bc9d68c4f5d1bdde7f741fb56a9648a6810faf57c2c67a7	16	SHA256 (rust/2024-06-13/rustc-1.79.0-armv7-unknown-freebsd.tar.xz) = f383b6affbbf1165d921f775ce1a3181403e91d73906cea7e060fcaa67407751
17	SIZE (rust/2024-05-02/rustc-1.78.0-armv7-unknown-freebsd.tar.xz) = 57684964	17	SIZE (rust/2024-06-13/rustc-1.79.0-armv7-unknown-freebsd.tar.xz) = 58252988
18	SHA256 (rust/2024-05-02/rust-std-1.78.0-armv7-unknown-freebsd.tar.xz) = bb9bdf1fb8dfcd7a94ddd85cacb7d01f95b9855ab1bbaf99edaa7195c04740ff	18	SHA256 (rust/2024-06-13/rust-std-1.79.0-armv7-unknown-freebsd.tar.xz) = f9723e91942cac08a5708149ada169f2f1557d9ae55d5608947b61f8c5b3de99
19	SIZE (rust/2024-05-02/rust-std-1.78.0-armv7-unknown-freebsd.tar.xz) = 24903216	19	SIZE (rust/2024-06-13/rust-std-1.79.0-armv7-unknown-freebsd.tar.xz) = 25099432
20	SHA256 (rust/2024-05-02/cargo-1.78.0-armv7-unknown-freebsd.tar.xz) = 2ac46611d5a150a243dbc303fb1e5375ef0663afa724f2bdfffa915f8c0e9a4a	20	SHA256 (rust/2024-06-13/cargo-1.79.0-armv7-unknown-freebsd.tar.xz) = 8dc712aace1f5f7c4244004d49d363da590b10bfc867460667dfab7b2ea8f93a
21	SIZE (rust/2024-05-02/cargo-1.78.0-armv7-unknown-freebsd.tar.xz) = 8884760	21	SIZE (rust/2024-06-13/cargo-1.79.0-armv7-unknown-freebsd.tar.xz) = 9084000
22	SHA256 (rust/2024-05-02/rustc-1.78.0-i686-unknown-freebsd.tar.xz) = 38b501d5b02abb94cb40c4738e01389fb6a086fc3426aee59fb9f918222ec779	22	SHA256 (rust/2024-06-13/rustc-1.79.0-i686-unknown-freebsd.tar.xz) = 54f647fb589ed7c60121c0ea9db9e2e49cae718ebabedecf521926faed011f72
23	SIZE (rust/2024-05-02/rustc-1.78.0-i686-unknown-freebsd.tar.xz) = 64399464	23	SIZE (rust/2024-06-13/rustc-1.79.0-i686-unknown-freebsd.tar.xz) = 64564744
24	SHA256 (rust/2024-05-02/rust-std-1.78.0-i686-unknown-freebsd.tar.xz) = 53e03241d71df0db0440c716dce8d43e42b9a1ed319fbc468a3b2d0bd03676b2	24	SHA256 (rust/2024-06-13/rust-std-1.79.0-i686-unknown-freebsd.tar.xz) = 3ab8428455e017844b6d96b7ca1302d3d4f6e40772e710ec8bb51bd78a68b26c
25	SIZE (rust/2024-05-02/rust-std-1.78.0-i686-unknown-freebsd.tar.xz) = 26038480	25	SIZE (rust/2024-06-13/rust-std-1.79.0-i686-unknown-freebsd.tar.xz) = 26080684
26	SHA256 (rust/2024-05-02/cargo-1.78.0-i686-unknown-freebsd.tar.xz) = f75b1d7f45736a5d048e4b68e41bbe986f3f414fd8be0eb2d116133868ddb110	26	SHA256 (rust/2024-06-13/cargo-1.79.0-i686-unknown-freebsd.tar.xz) = 61c0de5b2f1e75244f7752a8a647c26a7ff9a7a02d77c26da8fa038ad15e77a7
27	SIZE (rust/2024-05-02/cargo-1.78.0-i686-unknown-freebsd.tar.xz) = 10154936	27	SIZE (rust/2024-06-13/cargo-1.79.0-i686-unknown-freebsd.tar.xz) = 10455488
28	SHA256 (rust/2024-05-02/rustc-1.78.0-powerpc-unknown-freebsd.tar.xz) = dbe7c32f49be34098eb1199e3ce2e3cef748fc0a7339448aa258c7f4e41f9d1a	28	SHA256 (rust/2024-06-13/rustc-1.79.0-powerpc-unknown-freebsd.tar.xz) = b329fc7ba0222114a6c27626b39aaad479aae9752778d48e82c1b288eef38659
29	SIZE (rust/2024-05-02/rustc-1.78.0-powerpc-unknown-freebsd.tar.xz) = 61054892	29	SIZE (rust/2024-06-13/rustc-1.79.0-powerpc-unknown-freebsd.tar.xz) = 61616216
30	SHA256 (rust/2024-05-02/rust-std-1.78.0-powerpc-unknown-freebsd.tar.xz) = f130932c829c88064b89de7b511cacfa4d49273339a325e73f4f83b55592a764	30	SHA256 (rust/2024-06-13/rust-std-1.79.0-powerpc-unknown-freebsd.tar.xz) = cc51406487b879c653c533db6e0dc6597ee9228a88c1c9d1a09f066dbbaebbe9
31	SIZE (rust/2024-05-02/rust-std-1.78.0-powerpc-unknown-freebsd.tar.xz) = 24067100	31	SIZE (rust/2024-06-13/rust-std-1.79.0-powerpc-unknown-freebsd.tar.xz) = 24223360
32	SHA256 (rust/2024-05-02/cargo-1.78.0-powerpc-unknown-freebsd.tar.xz) = 76b93267895bf2f6fc24c6b46e68a6593a8d065545b0d46afeaddb4f9eda5615	32	SHA256 (rust/2024-06-13/cargo-1.79.0-powerpc-unknown-freebsd.tar.xz) = 5be8e77bdbfc791824dd9f5f59a3233fe135c451fee37bad795952164b9d7177
33	SIZE (rust/2024-05-02/cargo-1.78.0-powerpc-unknown-freebsd.tar.xz) = 9564996	33	SIZE (rust/2024-06-13/cargo-1.79.0-powerpc-unknown-freebsd.tar.xz) = 9710464
34	SHA256 (rust/2024-05-02/rustc-1.78.0-powerpc64-unknown-freebsd.tar.xz) = dac918f38b284d62eca95df2b29bbfb6eb6c8e8419bf57ac669f8b181def737a	34	SHA256 (rust/2024-06-13/rustc-1.79.0-powerpc64-unknown-freebsd.tar.xz) = 30240605e2e36706b2a5f603a4431645855c034e146c68fc720c242c210a4982
35	SIZE (rust/2024-05-02/rustc-1.78.0-powerpc64-unknown-freebsd.tar.xz) = 59532620	35	SIZE (rust/2024-06-13/rustc-1.79.0-powerpc64-unknown-freebsd.tar.xz) = 59944004
36	SHA256 (rust/2024-05-02/rust-std-1.78.0-powerpc64-unknown-freebsd.tar.xz) = 9eebd51b38a3a24ae57cec39b7368c2c1b30fc67c8d651d0829a752976d49158	36	SHA256 (rust/2024-06-13/rust-std-1.79.0-powerpc64-unknown-freebsd.tar.xz) = 7b135647ab38adf9feb82249b4ea3b51510f913b967839aa00c538dcbd5a27e0
37	SIZE (rust/2024-05-02/rust-std-1.78.0-powerpc64-unknown-freebsd.tar.xz) = 24058796	37	SIZE (rust/2024-06-13/rust-std-1.79.0-powerpc64-unknown-freebsd.tar.xz) = 24240820
38	SHA256 (rust/2024-05-02/cargo-1.78.0-powerpc64-unknown-freebsd.tar.xz) = 24ee0edbed6147aedd7d0d7d5f10774c59b3eefeabdbb20adca826ab79a7b608	38	SHA256 (rust/2024-06-13/cargo-1.79.0-powerpc64-unknown-freebsd.tar.xz) = 61d4c7c855c46c9c17cd9a9cec8da276e12ee44eb69cfdb2f5a566f837e1ca89
39	SIZE (rust/2024-05-02/cargo-1.78.0-powerpc64-unknown-freebsd.tar.xz) = 9137688	39	SIZE (rust/2024-06-13/cargo-1.79.0-powerpc64-unknown-freebsd.tar.xz) = 9363860
40	SHA256 (rust/2024-05-02/rustc-1.78.0-powerpc64le-unknown-freebsd.tar.xz) = a9e26efd3362b129d2002d6a629bc94abeadc721a776192887e13af78fd35738	40	SHA256 (rust/2024-06-13/rustc-1.79.0-powerpc64le-unknown-freebsd.tar.xz) = e53110045852b301724849befa9d9c1075be2604b60b78ee059ab6bad11b5115
41	SIZE (rust/2024-05-02/rustc-1.78.0-powerpc64le-unknown-freebsd.tar.xz) = 60918936	41	SIZE (rust/2024-06-13/rustc-1.79.0-powerpc64le-unknown-freebsd.tar.xz) = 61601448
42	SHA256 (rust/2024-05-02/rust-std-1.78.0-powerpc64le-unknown-freebsd.tar.xz) = 00a49af7bc1dc16ec18eec34b71055d6d42923220569c06d27ed3b5e0e5c4589	42	SHA256 (rust/2024-06-13/rust-std-1.79.0-powerpc64le-unknown-freebsd.tar.xz) = 1ab10291b3593ecc792ef2bb0959deedbfabb5bff0f999b2425d70694a5be851
43	SIZE (rust/2024-05-02/rust-std-1.78.0-powerpc64le-unknown-freebsd.tar.xz) = 24168348	43	SIZE (rust/2024-06-13/rust-std-1.79.0-powerpc64le-unknown-freebsd.tar.xz) = 24316744
44	SHA256 (rust/2024-05-02/cargo-1.78.0-powerpc64le-unknown-freebsd.tar.xz) = 79b6a00f2ea9fb88506dfefb057bd9b8abdbb01f9cf2fefe7c1dc3f146d9edc3	44	SHA256 (rust/2024-06-13/cargo-1.79.0-powerpc64le-unknown-freebsd.tar.xz) = 0a69abcb3462da593662c7a7dca9593b3dd79ffa55c32d7139a510458d51bd95
45	SIZE (rust/2024-05-02/cargo-1.78.0-powerpc64le-unknown-freebsd.tar.xz) = 9372912	45	SIZE (rust/2024-06-13/cargo-1.79.0-powerpc64le-unknown-freebsd.tar.xz) = 9617256
46	SHA256 (rust/2024-05-02/rustc-1.78.0-riscv64gc-unknown-freebsd.tar.xz) = 21f1e2f76501717810043e907ca7192447f010a0562d9a52253176a8655b3cf5	46	SHA256 (rust/2024-06-13/rustc-1.79.0-riscv64gc-unknown-freebsd.tar.xz) = 69ff7bb00195679a83e796b7cbf2c58940c26c63ad8094f527cae140d04015ee
47	SIZE (rust/2024-05-02/rustc-1.78.0-riscv64gc-unknown-freebsd.tar.xz) = 76153676	47	SIZE (rust/2024-06-13/rustc-1.79.0-riscv64gc-unknown-freebsd.tar.xz) = 68491292
48	SHA256 (rust/2024-05-02/rust-std-1.78.0-riscv64gc-unknown-freebsd.tar.xz) = 73d1645a06c4f2f8ad2462ba04878f6b8f0b7d93da1e562b4428a5e23c34cefb	48	SHA256 (rust/2024-06-13/rust-std-1.79.0-riscv64gc-unknown-freebsd.tar.xz) = 3462157b36db5b43d0c3c59704f648f03b8b6811d17136dcda0da1cf60f27df9
49	SIZE (rust/2024-05-02/rust-std-1.78.0-riscv64gc-unknown-freebsd.tar.xz) = 24204228	49	SIZE (rust/2024-06-13/rust-std-1.79.0-riscv64gc-unknown-freebsd.tar.xz) = 24204772
50	SHA256 (rust/2024-05-02/cargo-1.78.0-riscv64gc-unknown-freebsd.tar.xz) = b547ef7ae9d701b9bc618165f9882e3e40d2db74f6cb70a12a4b6b4ebaf2b414	50	SHA256 (rust/2024-06-13/cargo-1.79.0-riscv64gc-unknown-freebsd.tar.xz) = 44a1c32552f009514e6b88b79db1f24c74d587ef175a386a7fd67b1ae1947dab
51	SIZE (rust/2024-05-02/cargo-1.78.0-riscv64gc-unknown-freebsd.tar.xz) = 13083732	51	SIZE (rust/2024-06-13/cargo-1.79.0-riscv64gc-unknown-freebsd.tar.xz) = 11880636

Lines 8-42 until LLVM can be updated to use libc++ by default. Link Here

(-)b/lang/rust/files/patch-vendor_cc.rs (-31 / +2 lines)
8		8
9	https://reviews.llvm.org/D77776	9	https://reviews.llvm.org/D77776
10		10
11	--- vendor/cc-1.0.73/src/lib.rs.orig 2021-03-04 20:58:54 UTC
12	+++ vendor/cc-1.0.73/src/lib.rs
13	@@ -2659,24 +2659,7 @@ impl Tool {
14	}
15
16	fn with_features(path: PathBuf, clang_driver: Option<&str>, cuda: bool) -> Self {
17	- // Try to detect family of the tool from its name, falling back to Gnu.
18	- let family = if let Some(fname) = path.file_name().and_then(\|p\| p.to_str()) {
19	- if fname.contains("clang-cl") {
20	- ToolFamily::Msvc { clang_cl: true }
21	- } else if fname.ends_with("cl") \|\| fname == "cl.exe" {
22	- ToolFamily::Msvc { clang_cl: false }
23	- } else if fname.contains("clang") {
24	- match clang_driver {
25	- Some("cl") => ToolFamily::Msvc { clang_cl: true },
26	- _ => ToolFamily::Clang,
27	- }
28	- } else {
29	- ToolFamily::Gnu
30	- }
31	- } else {
32	- ToolFamily::Gnu
33	- };
34	-
35	+ let family = ToolFamily::Gnu;
36	Tool {
37	path: path,
38	cc_wrapper_path: None,
39
40	--- vendor/cc-1.0.79/src/lib.rs.orig 2021-03-04 20:58:54 UTC	11	--- vendor/cc-1.0.79/src/lib.rs.orig 2021-03-04 20:58:54 UTC
41	+++ vendor/cc-1.0.79/src/lib.rs	12	+++ vendor/cc-1.0.79/src/lib.rs
42	@@ -2659,24 +2659,7 @@ impl Tool {	13	@@ -2659,24 +2659,7 @@ impl Tool {
Lines 92-99 https://reviews.llvm.org/D77776 Link Here
92		63
93	Tool {	64	Tool {
94	path,	65	path,
95	--- vendor/cc-1.0.92/src/tool.rs.orig 2024-05-09 18:20:47 UTC	66	--- vendor/cc-1.0.97/src/tool.rs.orig 2024-05-09 18:20:47 UTC
96	+++ vendor/cc-1.0.92/src/tool.rs	67	+++ vendor/cc-1.0.97/src/tool.rs
97	@@ -151,9 +151,7 @@ impl Tool {	68	@@ -151,9 +151,7 @@ impl Tool {
98		69
99	match (clang, accepts_cl_style_flags, gcc) {	70	match (clang, accepts_cl_style_flags, gcc) {

Lines 1-10 Link Here

(-)b/lang/rust/files/riscv64/patch-vendor_openssl-src_src_lib.rs (-5 / +5 lines)
1	--- vendor/openssl-src-111.28.1+1.1.1w/src/lib.rs.orig 2021-11-04 11:27:54 UTC	1	--- vendor/openssl-src-111.28.2+1.1.1w/src/lib.rs.orig 2021-11-04 11:27:54 UTC
2	+++ vendor/openssl-src-111.28.1+1.1.1w/src/lib.rs	2	+++ vendor/openssl-src-111.28.2+1.1.1w/src/lib.rs
3	@@ -260,6 +260,7 @@ impl Build {	3	@@ -284,6 +284,7 @@ impl Build {
4	"powerpc64le-unknown-freebsd" => "BSD-generic64",
5	"powerpc64le-unknown-linux-gnu" => "linux-ppc64le",	4	"powerpc64le-unknown-linux-gnu" => "linux-ppc64le",
6	"powerpc64le-unknown-linux-musl" => "linux-ppc64le",	5	"powerpc64le-unknown-linux-musl" => "linux-ppc64le",
7	+ "riscv64gc-unknown-freebsd" => "BSD-generic64",
8	"riscv64gc-unknown-linux-gnu" => "linux-generic64",	6	"riscv64gc-unknown-linux-gnu" => "linux-generic64",
		7	+ "riscv64gc-unknown-freebsd" => "BSD-generic64",
9	"s390x-unknown-linux-gnu" => "linux64-s390x",	8	"s390x-unknown-linux-gnu" => "linux64-s390x",
10	"s390x-unknown-linux-musl" => "linux64-s390x",	9	"s390x-unknown-linux-musl" => "linux64-s390x",
		10	"x86_64-apple-darwin" => "darwin64-x86_64-cc",

Lines 8-17 version=$(</tmp/channel-rust-stable.toml tomlq -r '.pkg.rustc.version \| split(" Link Here

(-)b/lang/rust/update.sh (-5 / +5 lines)
8	new_commit=$(</tmp/channel-rust-stable.toml tomlq -r '.pkg.rustc.git_commit_hash')	8	new_commit=$(</tmp/channel-rust-stable.toml tomlq -r '.pkg.rustc.git_commit_hash')
9	rm /tmp/channel-rust-stable.toml	9	rm /tmp/channel-rust-stable.toml
10		10
11	fetch -qo - https://raw.githubusercontent.com/rust-lang/rust/${new_commit}/src/stage0.json \| jq -r '	11	fetch -qo /tmp/stage0 https://raw.githubusercontent.com/rust-lang/rust/${new_commit}/src/stage0
12	"BOOTSTRAPS_DATE=\(.compiler.date)",	12	BOOTSTRAPS_DATE=$(awk -F "=" /^compiler_date/'{print $2}' /tmp/stage0)
13	"RUST_BOOTSTRAP_VERSION=\(.compiler.version)"	13	RUST_BOOTSTRAP_VERSION=$(awk -F "=" /^compiler_version/'{print $2}' /tmp/stage0)
14	' \| portedit merge -i .	14	echo "BOOTSTRAPS_DATE=${BOOTSTRAPS_DATE}" \| portedit merge -i .
		15	echo "RUST_BOOTSTRAP_VERSION=${RUST_BOOTSTRAP_VERSION}" \| portedit merge -i .
15		16
16	cat <<EOF \| sed -i '' -E -f - ../../Mk/Uses/cargo.mk ../../Mk/bsd.gecko.mk	17	cat <<EOF \| sed -i '' -E -f - ../../Mk/Uses/cargo.mk ../../Mk/bsd.gecko.mk
17	1,/\\$\\{RUST_DEFAULT\\}>=/ {	18	1,/\\$\\{RUST_DEFAULT\\}>=/ {
18	-