Attachment #250509 for bug #278834

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.77.0:lang/${RUST_DEFAULT}	100	BUILD_DEPENDS+= ${RUST_DEFAULT}>=1.78.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.77.0:lang/${RUST_DEFAULT} \	77	${RUST_DEFAULT}>=1.78.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.77.0	5	PORTVERSION= 1.78.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 = 1710748679	1	TIMESTAMP = 1714719126
2	SHA256 (rust/rustc-1.77.0-src.tar.xz) = 66126989782cbf77fa3aff121bbb108429f2d46fe19328c3de231553de711b90	2	SHA256 (rust/rustc-1.78.0-src.tar.xz) = 8065824f0255faa3901db8206e6f9423f6f8c07cec28bc6f2797c6c948310ece
3	SIZE (rust/rustc-1.77.0-src.tar.xz) = 162805036	3	SIZE (rust/rustc-1.78.0-src.tar.xz) = 159181212

Lines 1-6 Link Here

(-)b/lang/rust/Makefile (-4 / +4 lines)
1	PORTNAME= rust	1	PORTNAME= rust
2	PORTVERSION?= 1.77.0	2	PORTVERSION?= 1.78.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 68-75 WASM_VARS= _COMPONENTS+="rust-analysis-${_PACKAGE_VERS}-wasm32-unknown-unknown Link Here
68	_RUST_TARGETS+=wasm32-unknown-unknown	68	_RUST_TARGETS+=wasm32-unknown-unknown
69		69
70	# See WRKSRC/src/stage0.json for the date and version values	70	# See WRKSRC/src/stage0.json for the date and version values
71	BOOTSTRAPS_DATE?= 2024-02-08	71	BOOTSTRAPS_DATE?= 2024-03-21
72	RUST_BOOTSTRAP_VERSION?= 1.76.0	72	RUST_BOOTSTRAP_VERSION?= 1.77.0
73		73
74	CARGO_VENDOR_DIR?= ${WRKSRC}/vendor	74	CARGO_VENDOR_DIR?= ${WRKSRC}/vendor
75		75




TIMESTAMP = 1714719125
SHA256 (rust/rustc-1.78.0-src.tar.xz) = 8065824f0255faa3901db8206e6f9423f6f8c07cec28bc6f2797c6c948310ece
SIZE (rust/rustc-1.78.0-src.tar.xz) = 159181212
SHA256 (rust/2024-03-21/rustc-1.77.0-aarch64-unknown-freebsd.tar.xz) = b8c0c1f4ac561c94023ac3e61bb05cc48868b08b408e4a889209628552cfa696
SIZE (rust/2024-03-21/rustc-1.77.0-aarch64-unknown-freebsd.tar.xz) = 55677936
SHA256 (rust/2024-03-21/rust-std-1.77.0-aarch64-unknown-freebsd.tar.xz) = cf609884cf154e8ba9bd3838bf508c100c5420dd9b62dcdc1d2d772637745806
SIZE (rust/2024-03-21/rust-std-1.77.0-aarch64-unknown-freebsd.tar.xz) = 25613204
SHA256 (rust/2024-03-21/cargo-1.77.0-aarch64-unknown-freebsd.tar.xz) = bd6d57c016f64facd353c16d4540b894ad46a8153c03292c4dbdd1e71883d296
SIZE (rust/2024-03-21/cargo-1.77.0-aarch64-unknown-freebsd.tar.xz) = 8789392
SHA256 (rust/2024-03-21/rustc-1.77.0-x86_64-unknown-freebsd.tar.xz) = c8f690079fa43d18c644b7239d884a4f40319299ed04f274be85e8572398b7a0
SIZE (rust/2024-03-21/rustc-1.77.0-x86_64-unknown-freebsd.tar.xz) = 45066612
SHA256 (rust/2024-03-21/rust-std-1.77.0-x86_64-unknown-freebsd.tar.xz) = f4300a839fa6df8a3861b1583d47f17b5efd72a09466a6056ed654e7415936fd
SIZE (rust/2024-03-21/rust-std-1.77.0-x86_64-unknown-freebsd.tar.xz) = 26400816
SHA256 (rust/2024-03-21/cargo-1.77.0-x86_64-unknown-freebsd.tar.xz) = 82b166b6d3e0e4f09224bfc75e0d3a9db75228983d20e021adef3922c50c35ce
SIZE (rust/2024-03-21/cargo-1.77.0-x86_64-unknown-freebsd.tar.xz) = 9765968
SHA256 (rust/2024-03-21/rustc-1.77.0-armv7-unknown-freebsd.tar.xz) = beb39431f8b0625607b2a276c77001c5e71613005a6b2b72a3bd94878e8d2c5a
SIZE (rust/2024-03-21/rustc-1.77.0-armv7-unknown-freebsd.tar.xz) = 56049192
SHA256 (rust/2024-03-21/rust-std-1.77.0-armv7-unknown-freebsd.tar.xz) = fd9ad61cd1bdc3e743b6d86a4f1b635c365750d6ea7de193eba58f608cde9a99
SIZE (rust/2024-03-21/rust-std-1.77.0-armv7-unknown-freebsd.tar.xz) = 25031820
SHA256 (rust/2024-03-21/cargo-1.77.0-armv7-unknown-freebsd.tar.xz) = 38192d50b9358b60dffb93a70986a05271f410ba75f7d2a66671281a7d53ea58
SIZE (rust/2024-03-21/cargo-1.77.0-armv7-unknown-freebsd.tar.xz) = 8806328
SHA256 (rust/2024-03-21/rustc-1.77.0-i686-unknown-freebsd.tar.xz) = f673b37ca9d259ac619987ff0559c922f6284eaa6c77e6dcf04f665cba46ecc7
SIZE (rust/2024-03-21/rustc-1.77.0-i686-unknown-freebsd.tar.xz) = 62316264
SHA256 (rust/2024-03-21/rust-std-1.77.0-i686-unknown-freebsd.tar.xz) = 2268a4bbdf103e66d58229aa522948af25d91507a982d883c9835a8fc4ea869c
SIZE (rust/2024-03-21/rust-std-1.77.0-i686-unknown-freebsd.tar.xz) = 26171668
SHA256 (rust/2024-03-21/cargo-1.77.0-i686-unknown-freebsd.tar.xz) = 81433410da18557780134ff00dcbf9d1945b8f54cd7051273246cc047761e9a3
SIZE (rust/2024-03-21/cargo-1.77.0-i686-unknown-freebsd.tar.xz) = 10015380
SHA256 (rust/2024-03-21/rustc-1.77.0-powerpc-unknown-freebsd.tar.xz) = 9a45efe873a3862909e5e1252e481b6aef72216b22ad1c317eeaaafa9fdfaf90
SIZE (rust/2024-03-21/rustc-1.77.0-powerpc-unknown-freebsd.tar.xz) = 59996448
SHA256 (rust/2024-03-21/rust-std-1.77.0-powerpc-unknown-freebsd.tar.xz) = 2e0ab25bfeb0efc5c5aafb753b34b65692c4e87d2083c865f726db5eff9fdf24
SIZE (rust/2024-03-21/rust-std-1.77.0-powerpc-unknown-freebsd.tar.xz) = 24278008
SHA256 (rust/2024-03-21/cargo-1.77.0-powerpc-unknown-freebsd.tar.xz) = 22fdac0eadc5202c7fb0a1268748b793e95897fd5c95545d13e5140df7eda97b
SIZE (rust/2024-03-21/cargo-1.77.0-powerpc-unknown-freebsd.tar.xz) = 9944700
SHA256 (rust/2024-03-21/rustc-1.77.0-powerpc64-unknown-freebsd.tar.xz) = 53d7655656c53d065a108bf57bfbf7be1f7e14f8e1a00be06d2815d35a1375ce
SIZE (rust/2024-03-21/rustc-1.77.0-powerpc64-unknown-freebsd.tar.xz) = 58964296
SHA256 (rust/2024-03-21/rust-std-1.77.0-powerpc64-unknown-freebsd.tar.xz) = 905ddb832b0e005248c044f603afada55674fe3bceca96ca3212eec2130d9746
SIZE (rust/2024-03-21/rust-std-1.77.0-powerpc64-unknown-freebsd.tar.xz) = 24292400
SHA256 (rust/2024-03-21/cargo-1.77.0-powerpc64-unknown-freebsd.tar.xz) = d12e818d9221f1fe9590b0153e018937ba2c90aba081578dc87792605467c839
SIZE (rust/2024-03-21/cargo-1.77.0-powerpc64-unknown-freebsd.tar.xz) = 9617420
SHA256 (rust/2024-03-21/rustc-1.77.0-powerpc64le-unknown-freebsd.tar.xz) = e46369a0bbac72a8a931aed5efb71d47c41c135415380fcf06daf9c77dfc7609
SIZE (rust/2024-03-21/rustc-1.77.0-powerpc64le-unknown-freebsd.tar.xz) = 60839172
SHA256 (rust/2024-03-21/rust-std-1.77.0-powerpc64le-unknown-freebsd.tar.xz) = dda78aad0a5b500321b1067afb6f2f423c2a1811c75d8c7a2c54a7498f0d9975
SIZE (rust/2024-03-21/rust-std-1.77.0-powerpc64le-unknown-freebsd.tar.xz) = 24364400
SHA256 (rust/2024-03-21/cargo-1.77.0-powerpc64le-unknown-freebsd.tar.xz) = cf454e20b7d7356f9a08c368d5d00fefc5b4d591e263a57df15d8c5d24d792f8
SIZE (rust/2024-03-21/cargo-1.77.0-powerpc64le-unknown-freebsd.tar.xz) = 9978364
SHA256 (rust/2024-03-21/rustc-1.77.0-riscv64gc-unknown-freebsd.tar.xz) = ca3ab27fd22c1919e9b1c6b0be3db9dfc4571a867db83007f68356ebedc3c08f
SIZE (rust/2024-03-21/rustc-1.77.0-riscv64gc-unknown-freebsd.tar.xz) = 70096420
SHA256 (rust/2024-03-21/rust-std-1.77.0-riscv64gc-unknown-freebsd.tar.xz) = 2e3a76771d1281606793f7724521ca7e7019d1a00f1cef3da6bf961348228d27
SIZE (rust/2024-03-21/rust-std-1.77.0-riscv64gc-unknown-freebsd.tar.xz) = 24331376
SHA256 (rust/2024-03-21/cargo-1.77.0-riscv64gc-unknown-freebsd.tar.xz) = a728e4333c602d4bc330964df090f6bd0e3228744f55640595957f9862ba735c
SIZE (rust/2024-03-21/cargo-1.77.0-riscv64gc-unknown-freebsd.tar.xz) = 12483200




error[E0308]: mismatched types
    --> compiler/rustc_driver_impl/src/signal_handler.rs:43:63
     |
43   |        let depth = libc::backtrace(STACK_TRACE.as_mut_ptr(), MAX_FRAMES as i32);
     |                    ---------------                           ^^^^^^^^^^^^^^^^^ expected `usize`, found `i32`
     |                    |
     |                    arguments to this function are incorrect
     |
note: function defined here
    --> /wrkdirs/usr/ports/lang/rust-bootstrap/work-armv7/rustc-1.78.0-src/vendor/libc/src/unix/bsd/freebsdlike/mod.rs:1861:12
     |
1861 |     pub fn backtrace(addrlist: *mut *mut ::c_void, len: ::size_t) -> ::size_t;
     |            ^^^^^^^^^
help: you can convert an `i32` to a `usize` and panic if the converted value doesn't fit
     |
43   |         let depth = libc::backtrace(STACK_TRACE.as_mut_ptr(), (MAX_FRAMES as i32).try_into().unwrap());

--- compiler/rustc_driver_impl/src/signal_handler.rs.orig	2024-05-06 16:00:17 UTC
+++ compiler/rustc_driver_impl/src/signal_handler.rs
@@ -40,7 +40,7 @@ extern "C" fn print_stack_trace(_: libc::c_int) {
     static mut STACK_TRACE: [*mut libc::c_void; MAX_FRAMES] = [ptr::null_mut(); MAX_FRAMES];
     let stack = unsafe {
         // Collect return addresses
-        let depth = libc::backtrace(STACK_TRACE.as_mut_ptr(), MAX_FRAMES as i32);
+        let depth = libc::backtrace(STACK_TRACE.as_mut_ptr(), (MAX_FRAMES as i32).try_into().unwrap());
         if depth == 0 {
             return;
         }




gnueabihf was changed to gnu in this commit and it breaks rustix
https://github.com/rust-lang/rust/commit/93ec0e6299e31e6857e8ad741750034f35762b11


--- vendor/rustix/src/backend/libc/fs/syscalls.rs.orig	2024-05-06 16:29:17.182875000 +0200
+++ vendor/rustix/src/backend/libc/fs/syscalls.rs	2024-05-06 16:29:48.897744000 +0200
@@ -140,7 +140,7 @@ pub(crate) fn open(path: &CStr, oflags: OFlags, mode: 
 pub(crate) fn open(path: &CStr, oflags: OFlags, mode: Mode) -> io::Result<OwnedFd> {
     // Work around <https://sourceware.org/bugzilla/show_bug.cgi?id=17523>.
     // glibc versions before 2.25 don't handle `O_TMPFILE` correctly.
-    #[cfg(all(unix, target_env = "gnu", not(target_os = "hurd")))]
+    #[cfg(all(unix, target_env = "gnu", not(any(target_os = "freebsd", target_os = "hurd"))))]
     if oflags.contains(OFlags::TMPFILE) && crate::backend::if_glibc_is_less_than_2_25() {
         return open_via_syscall(path, oflags, mode);
     }
@@ -203,7 +203,7 @@ pub(crate) fn openat(
 ) -> io::Result<OwnedFd> {
     // Work around <https://sourceware.org/bugzilla/show_bug.cgi?id=17523>.
     // glibc versions before 2.25 don't handle `O_TMPFILE` correctly.
-    #[cfg(all(unix, target_env = "gnu", not(target_os = "hurd")))]
+    #[cfg(all(unix, target_env = "gnu", not(any(target_os = "freebsd", target_os = "hurd"))))]
     if oflags.contains(OFlags::TMPFILE) && crate::backend::if_glibc_is_less_than_2_25() {
         return openat_via_syscall(dirfd, path, oflags, mode);
     }





https://reviews.llvm.org/D77776

--- vendor/cc/src/tool.rs.orig	2024-03-18 11:23:17 UTC
+++ vendor/cc/src/tool.rs
@@ -122,22 +122,7 @@ impl Tool {
         };
 
         // Try to detect family of the tool from its name, falling back to Gnu.
-        // 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 }

-                    _ => ToolFamily::Clang,
-                }
-            } else {
-                detect_family(&path)
-            }
-        } else {
-            detect_family(&path)
-        };
-
+        let family = ToolFamily::Gnu;
 
         Tool {
             path,
             cc_wrapper_path: None,
- 

Return to bug 278834

Lines 1-51 Link Here

(-)b/lang/rust/distinfo (-51 / +51 lines)
1	TIMESTAMP = 1711456563	1	TIMESTAMP = 1714719125
2	SHA256 (rust/rustc-1.77.0-src.tar.xz) = 66126989782cbf77fa3aff121bbb108429f2d46fe19328c3de231553de711b90	2	SHA256 (rust/rustc-1.78.0-src.tar.xz) = 8065824f0255faa3901db8206e6f9423f6f8c07cec28bc6f2797c6c948310ece
3	SIZE (rust/rustc-1.77.0-src.tar.xz) = 162805036	3	SIZE (rust/rustc-1.78.0-src.tar.xz) = 159181212
4	SHA256 (rust/2024-02-08/rustc-1.76.0-aarch64-unknown-freebsd.tar.xz) = f0b25d271209ddc1e4def1f1d56e9e8ae4f7a82568f5642f41fbda8609917535	4	SHA256 (rust/2024-03-21/rustc-1.77.0-aarch64-unknown-freebsd.tar.xz) = b8c0c1f4ac561c94023ac3e61bb05cc48868b08b408e4a889209628552cfa696
5	SIZE (rust/2024-02-08/rustc-1.76.0-aarch64-unknown-freebsd.tar.xz) = 57385336	5	SIZE (rust/2024-03-21/rustc-1.77.0-aarch64-unknown-freebsd.tar.xz) = 55677936
6	SHA256 (rust/2024-02-08/rust-std-1.76.0-aarch64-unknown-freebsd.tar.xz) = 7ff348be5bc862ccc56f8a9618bffa82996a7e10627dd3a40beb08c86301e2c6	6	SHA256 (rust/2024-03-21/rust-std-1.77.0-aarch64-unknown-freebsd.tar.xz) = cf609884cf154e8ba9bd3838bf508c100c5420dd9b62dcdc1d2d772637745806
7	SIZE (rust/2024-02-08/rust-std-1.76.0-aarch64-unknown-freebsd.tar.xz) = 25689920	7	SIZE (rust/2024-03-21/rust-std-1.77.0-aarch64-unknown-freebsd.tar.xz) = 25613204
8	SHA256 (rust/2024-02-08/cargo-1.76.0-aarch64-unknown-freebsd.tar.xz) = dd57f627601fa0e9c2b4137ac837f9d70756e9996127c63ac55be9029adac431	8	SHA256 (rust/2024-03-21/cargo-1.77.0-aarch64-unknown-freebsd.tar.xz) = bd6d57c016f64facd353c16d4540b894ad46a8153c03292c4dbdd1e71883d296
9	SIZE (rust/2024-02-08/cargo-1.76.0-aarch64-unknown-freebsd.tar.xz) = 9265312	9	SIZE (rust/2024-03-21/cargo-1.77.0-aarch64-unknown-freebsd.tar.xz) = 8789392
10	SHA256 (rust/2024-02-08/rustc-1.76.0-x86_64-unknown-freebsd.tar.xz) = d6b41c957c1f5316719f067d8c6de79dacab0d2bd58da44d3645097b74bce91d	10	SHA256 (rust/2024-03-21/rustc-1.77.0-x86_64-unknown-freebsd.tar.xz) = c8f690079fa43d18c644b7239d884a4f40319299ed04f274be85e8572398b7a0
11	SIZE (rust/2024-02-08/rustc-1.76.0-x86_64-unknown-freebsd.tar.xz) = 46043156	11	SIZE (rust/2024-03-21/rustc-1.77.0-x86_64-unknown-freebsd.tar.xz) = 45066612
12	SHA256 (rust/2024-02-08/rust-std-1.76.0-x86_64-unknown-freebsd.tar.xz) = 3566fb8773dc5d65996a6137c327a2c43856f4b1807a28a7a6ccfd5e661b51a5	12	SHA256 (rust/2024-03-21/rust-std-1.77.0-x86_64-unknown-freebsd.tar.xz) = f4300a839fa6df8a3861b1583d47f17b5efd72a09466a6056ed654e7415936fd
13	SIZE (rust/2024-02-08/rust-std-1.76.0-x86_64-unknown-freebsd.tar.xz) = 26331780	13	SIZE (rust/2024-03-21/rust-std-1.77.0-x86_64-unknown-freebsd.tar.xz) = 26400816
14	SHA256 (rust/2024-02-08/cargo-1.76.0-x86_64-unknown-freebsd.tar.xz) = 9e5dd4b595be7c842577a8adf6cb8a25021276493faae484ba7c3266274929e5	14	SHA256 (rust/2024-03-21/cargo-1.77.0-x86_64-unknown-freebsd.tar.xz) = 82b166b6d3e0e4f09224bfc75e0d3a9db75228983d20e021adef3922c50c35ce
15	SIZE (rust/2024-02-08/cargo-1.76.0-x86_64-unknown-freebsd.tar.xz) = 10293320	15	SIZE (rust/2024-03-21/cargo-1.77.0-x86_64-unknown-freebsd.tar.xz) = 9765968
16	SHA256 (rust/2024-02-08/rustc-1.76.0-armv7-unknown-freebsd.tar.xz) = 23ea462bfb356e87ecc2b6fddb50c3e8dc3e9ec871b36c71e0726b91d2f75d4a	16	SHA256 (rust/2024-03-21/rustc-1.77.0-armv7-unknown-freebsd.tar.xz) = beb39431f8b0625607b2a276c77001c5e71613005a6b2b72a3bd94878e8d2c5a
17	SIZE (rust/2024-02-08/rustc-1.76.0-armv7-unknown-freebsd.tar.xz) = 57559240	17	SIZE (rust/2024-03-21/rustc-1.77.0-armv7-unknown-freebsd.tar.xz) = 56049192
18	SHA256 (rust/2024-02-08/rust-std-1.76.0-armv7-unknown-freebsd.tar.xz) = 9455ab2df3e1998c759969866fa3faca7f595de7cc10e76eaf5c869b24993d24	18	SHA256 (rust/2024-03-21/rust-std-1.77.0-armv7-unknown-freebsd.tar.xz) = fd9ad61cd1bdc3e743b6d86a4f1b635c365750d6ea7de193eba58f608cde9a99
19	SIZE (rust/2024-02-08/rust-std-1.76.0-armv7-unknown-freebsd.tar.xz) = 25064708	19	SIZE (rust/2024-03-21/rust-std-1.77.0-armv7-unknown-freebsd.tar.xz) = 25031820
20	SHA256 (rust/2024-02-08/cargo-1.76.0-armv7-unknown-freebsd.tar.xz) = 5ce24b5596addf05154fe2ab42b95be9ce89595c0d52945297f952af5dbecc06	20	SHA256 (rust/2024-03-21/cargo-1.77.0-armv7-unknown-freebsd.tar.xz) = 38192d50b9358b60dffb93a70986a05271f410ba75f7d2a66671281a7d53ea58
21	SIZE (rust/2024-02-08/cargo-1.76.0-armv7-unknown-freebsd.tar.xz) = 9322500	21	SIZE (rust/2024-03-21/cargo-1.77.0-armv7-unknown-freebsd.tar.xz) = 8806328
22	SHA256 (rust/2024-02-08/rustc-1.76.0-i686-unknown-freebsd.tar.xz) = 6a112c3cda138a6cb99195b4289a4397a26b5409379d0bcd18843d976e5b27f4	22	SHA256 (rust/2024-03-21/rustc-1.77.0-i686-unknown-freebsd.tar.xz) = f673b37ca9d259ac619987ff0559c922f6284eaa6c77e6dcf04f665cba46ecc7
23	SIZE (rust/2024-02-08/rustc-1.76.0-i686-unknown-freebsd.tar.xz) = 64357228	23	SIZE (rust/2024-03-21/rustc-1.77.0-i686-unknown-freebsd.tar.xz) = 62316264
24	SHA256 (rust/2024-02-08/rust-std-1.76.0-i686-unknown-freebsd.tar.xz) = c99bbef70d2f9f2e3c716e10e026665c1a48317dae1919de99f667064173f9ce	24	SHA256 (rust/2024-03-21/rust-std-1.77.0-i686-unknown-freebsd.tar.xz) = 2268a4bbdf103e66d58229aa522948af25d91507a982d883c9835a8fc4ea869c
25	SIZE (rust/2024-02-08/rust-std-1.76.0-i686-unknown-freebsd.tar.xz) = 26304688	25	SIZE (rust/2024-03-21/rust-std-1.77.0-i686-unknown-freebsd.tar.xz) = 26171668
26	SHA256 (rust/2024-02-08/cargo-1.76.0-i686-unknown-freebsd.tar.xz) = 66e00532dd450cbc8613771e2f4285b70ac5cb72c9daecb2751dc206c74689c5	26	SHA256 (rust/2024-03-21/cargo-1.77.0-i686-unknown-freebsd.tar.xz) = 81433410da18557780134ff00dcbf9d1945b8f54cd7051273246cc047761e9a3
27	SIZE (rust/2024-02-08/cargo-1.76.0-i686-unknown-freebsd.tar.xz) = 10623276	27	SIZE (rust/2024-03-21/cargo-1.77.0-i686-unknown-freebsd.tar.xz) = 10015380
28	SHA256 (rust/2024-02-08/rustc-1.76.0-powerpc-unknown-freebsd.tar.xz) = c8ad87381bf87c9136841894b3c651c7f93f0fc686bc835f9d70397c877d7c98	28	SHA256 (rust/2024-03-21/rustc-1.77.0-powerpc-unknown-freebsd.tar.xz) = 9a45efe873a3862909e5e1252e481b6aef72216b22ad1c317eeaaafa9fdfaf90
29	SIZE (rust/2024-02-08/rustc-1.76.0-powerpc-unknown-freebsd.tar.xz) = 61862920	29	SIZE (rust/2024-03-21/rustc-1.77.0-powerpc-unknown-freebsd.tar.xz) = 59996448
30	SHA256 (rust/2024-02-08/rust-std-1.76.0-powerpc-unknown-freebsd.tar.xz) = ee08bd50697cd0f11842248838a324e2b796a483f74cd9f37258fe5d03390f3f	30	SHA256 (rust/2024-03-21/rust-std-1.77.0-powerpc-unknown-freebsd.tar.xz) = 2e0ab25bfeb0efc5c5aafb753b34b65692c4e87d2083c865f726db5eff9fdf24
31	SIZE (rust/2024-02-08/rust-std-1.76.0-powerpc-unknown-freebsd.tar.xz) = 24225220	31	SIZE (rust/2024-03-21/rust-std-1.77.0-powerpc-unknown-freebsd.tar.xz) = 24278008
32	SHA256 (rust/2024-02-08/cargo-1.76.0-powerpc-unknown-freebsd.tar.xz) = 0ee63c0a159250ec13da2a5a6c310d88c4ebfbb0582a8f29ef6660355d94d3eb	32	SHA256 (rust/2024-03-21/cargo-1.77.0-powerpc-unknown-freebsd.tar.xz) = 22fdac0eadc5202c7fb0a1268748b793e95897fd5c95545d13e5140df7eda97b
33	SIZE (rust/2024-02-08/cargo-1.76.0-powerpc-unknown-freebsd.tar.xz) = 10494116	33	SIZE (rust/2024-03-21/cargo-1.77.0-powerpc-unknown-freebsd.tar.xz) = 9944700
34	SHA256 (rust/2024-02-08/rustc-1.76.0-powerpc64-unknown-freebsd.tar.xz) = a16c057e1bb889ef0f8f86498b22f5c865a75d807511f8e6e52c9e5fc25fb0f6	34	SHA256 (rust/2024-03-21/rustc-1.77.0-powerpc64-unknown-freebsd.tar.xz) = 53d7655656c53d065a108bf57bfbf7be1f7e14f8e1a00be06d2815d35a1375ce
35	SIZE (rust/2024-02-08/rustc-1.76.0-powerpc64-unknown-freebsd.tar.xz) = 60767760	35	SIZE (rust/2024-03-21/rustc-1.77.0-powerpc64-unknown-freebsd.tar.xz) = 58964296
36	SHA256 (rust/2024-02-08/rust-std-1.76.0-powerpc64-unknown-freebsd.tar.xz) = e8097fe97c77ee71fc8a99eb923c8f080f044577818b7ad8892149b007515e75	36	SHA256 (rust/2024-03-21/rust-std-1.77.0-powerpc64-unknown-freebsd.tar.xz) = 905ddb832b0e005248c044f603afada55674fe3bceca96ca3212eec2130d9746
37	SIZE (rust/2024-02-08/rust-std-1.76.0-powerpc64-unknown-freebsd.tar.xz) = 24245360	37	SIZE (rust/2024-03-21/rust-std-1.77.0-powerpc64-unknown-freebsd.tar.xz) = 24292400
38	SHA256 (rust/2024-02-08/cargo-1.76.0-powerpc64-unknown-freebsd.tar.xz) = 3e0b07a62d9cf8f9e10e647ee322c7b445e1a85683bae10fcf5fc78751dd0a4f	38	SHA256 (rust/2024-03-21/cargo-1.77.0-powerpc64-unknown-freebsd.tar.xz) = d12e818d9221f1fe9590b0153e018937ba2c90aba081578dc87792605467c839
39	SIZE (rust/2024-02-08/cargo-1.76.0-powerpc64-unknown-freebsd.tar.xz) = 10272448	39	SIZE (rust/2024-03-21/cargo-1.77.0-powerpc64-unknown-freebsd.tar.xz) = 9617420
40	SHA256 (rust/2024-02-08/rustc-1.76.0-powerpc64le-unknown-freebsd.tar.xz) = 604a89241acaf53b7e8555cdc9f5f8bf13a2f1573af58a3f77c9fb9347cf2848	40	SHA256 (rust/2024-03-21/rustc-1.77.0-powerpc64le-unknown-freebsd.tar.xz) = e46369a0bbac72a8a931aed5efb71d47c41c135415380fcf06daf9c77dfc7609
41	SIZE (rust/2024-02-08/rustc-1.76.0-powerpc64le-unknown-freebsd.tar.xz) = 62546460	41	SIZE (rust/2024-03-21/rustc-1.77.0-powerpc64le-unknown-freebsd.tar.xz) = 60839172
42	SHA256 (rust/2024-02-08/rust-std-1.76.0-powerpc64le-unknown-freebsd.tar.xz) = e8b30cb0bde065b34b41ba279a4c3077c0f2b5391de881b631b4030e7eee26e4	42	SHA256 (rust/2024-03-21/rust-std-1.77.0-powerpc64le-unknown-freebsd.tar.xz) = dda78aad0a5b500321b1067afb6f2f423c2a1811c75d8c7a2c54a7498f0d9975
43	SIZE (rust/2024-02-08/rust-std-1.76.0-powerpc64le-unknown-freebsd.tar.xz) = 24368908	43	SIZE (rust/2024-03-21/rust-std-1.77.0-powerpc64le-unknown-freebsd.tar.xz) = 24364400
44	SHA256 (rust/2024-02-08/cargo-1.76.0-powerpc64le-unknown-freebsd.tar.xz) = 329535594705efb520d35a749a73ff518ed4bedbfe57491e4b38fa4cd756fa03	44	SHA256 (rust/2024-03-21/cargo-1.77.0-powerpc64le-unknown-freebsd.tar.xz) = cf454e20b7d7356f9a08c368d5d00fefc5b4d591e263a57df15d8c5d24d792f8
45	SIZE (rust/2024-02-08/cargo-1.76.0-powerpc64le-unknown-freebsd.tar.xz) = 10596008	45	SIZE (rust/2024-03-21/cargo-1.77.0-powerpc64le-unknown-freebsd.tar.xz) = 9978364
46	SHA256 (rust/2024-02-08/rustc-1.76.0-riscv64gc-unknown-freebsd.tar.xz) = 0ae66f2d6cdbaf2c626f4af491312fb90ac05d1ccdc5eebcc3942847a98775df	46	SHA256 (rust/2024-03-21/rustc-1.77.0-riscv64gc-unknown-freebsd.tar.xz) = ca3ab27fd22c1919e9b1c6b0be3db9dfc4571a867db83007f68356ebedc3c08f
47	SIZE (rust/2024-02-08/rustc-1.76.0-riscv64gc-unknown-freebsd.tar.xz) = 72687416	47	SIZE (rust/2024-03-21/rustc-1.77.0-riscv64gc-unknown-freebsd.tar.xz) = 70096420
48	SHA256 (rust/2024-02-08/rust-std-1.76.0-riscv64gc-unknown-freebsd.tar.xz) = 4d7b6f81f4d9e7a38341d4d0f3612ba28c53a6c9716220eac2a9923ae8718762	48	SHA256 (rust/2024-03-21/rust-std-1.77.0-riscv64gc-unknown-freebsd.tar.xz) = 2e3a76771d1281606793f7724521ca7e7019d1a00f1cef3da6bf961348228d27
49	SIZE (rust/2024-02-08/rust-std-1.76.0-riscv64gc-unknown-freebsd.tar.xz) = 24299456	49	SIZE (rust/2024-03-21/rust-std-1.77.0-riscv64gc-unknown-freebsd.tar.xz) = 24331376
50	SHA256 (rust/2024-02-08/cargo-1.76.0-riscv64gc-unknown-freebsd.tar.xz) = 1ad0ffd64284dc7e0903a5087bd14794dc86cdb65ff4323b430771ff029ce954	50	SHA256 (rust/2024-03-21/cargo-1.77.0-riscv64gc-unknown-freebsd.tar.xz) = a728e4333c602d4bc330964df090f6bd0e3228744f55640595957f9862ba735c
51	SIZE (rust/2024-02-08/cargo-1.76.0-riscv64gc-unknown-freebsd.tar.xz) = 13117416	51	SIZE (rust/2024-03-21/cargo-1.77.0-riscv64gc-unknown-freebsd.tar.xz) = 12483200

Added Link Here

(-)b/lang/rust/files/armv7/patch-compiler_rustc__driver__impl_src_signal__handler.rs (+28 lines)
1	error[E0308]: mismatched types
2	--> compiler/rustc_driver_impl/src/signal_handler.rs:43:63
3	\|
4	43 \| let depth = libc::backtrace(STACK_TRACE.as_mut_ptr(), MAX_FRAMES as i32);
5	\| --------------- ^^^^^^^^^^^^^^^^^ expected `usize`, found `i32`
6	\| \|
7	\| arguments to this function are incorrect
8	\|
9	note: function defined here
10	--> /wrkdirs/usr/ports/lang/rust-bootstrap/work-armv7/rustc-1.78.0-src/vendor/libc/src/unix/bsd/freebsdlike/mod.rs:1861:12
11	\|
12	1861 \| pub fn backtrace(addrlist: mut mut ::c_void, len: ::size_t) -> ::size_t;
13	\| ^^^^^^^^^
14	help: you can convert an `i32` to a `usize` and panic if the converted value doesn't fit
15	\|
16	43 \| let depth = libc::backtrace(STACK_TRACE.as_mut_ptr(), (MAX_FRAMES as i32).try_into().unwrap());
17
18	--- compiler/rustc_driver_impl/src/signal_handler.rs.orig 2024-05-06 16:00:17 UTC
19	+++ compiler/rustc_driver_impl/src/signal_handler.rs
20	@@ -40,7 +40,7 @@ extern "C" fn print_stack_trace(_: libc::c_int) {
21	static mut STACK_TRACE: [*mut libc::c_void; MAX_FRAMES] = [ptr::null_mut(); MAX_FRAMES];
22	let stack = unsafe {
23	// Collect return addresses
24	- let depth = libc::backtrace(STACK_TRACE.as_mut_ptr(), MAX_FRAMES as i32);
25	+ let depth = libc::backtrace(STACK_TRACE.as_mut_ptr(), (MAX_FRAMES as i32).try_into().unwrap());
26	if depth == 0 {
27	return;
28	}

Added Link Here

(-)b/lang/rust/files/armv7/patch-vendor_rustix_src_backend_libc_fs_syscalls.rs (+24 lines)
1	gnueabihf was changed to gnu in this commit and it breaks rustix
2	https://github.com/rust-lang/rust/commit/93ec0e6299e31e6857e8ad741750034f35762b11
3
4
5	--- vendor/rustix/src/backend/libc/fs/syscalls.rs.orig 2024-05-06 16:29:17.182875000 +0200
6	+++ vendor/rustix/src/backend/libc/fs/syscalls.rs 2024-05-06 16:29:48.897744000 +0200
7	@@ -140,7 +140,7 @@ pub(crate) fn open(path: &CStr, oflags: OFlags, mode:
8	pub(crate) fn open(path: &CStr, oflags: OFlags, mode: Mode) -> io::Result<OwnedFd> {
9	// Work around <https://sourceware.org/bugzilla/show_bug.cgi?id=17523>.
10	// glibc versions before 2.25 don't handle `O_TMPFILE` correctly.
11	- #[cfg(all(unix, target_env = "gnu", not(target_os = "hurd")))]
12	+ #[cfg(all(unix, target_env = "gnu", not(any(target_os = "freebsd", target_os = "hurd"))))]
13	if oflags.contains(OFlags::TMPFILE) && crate::backend::if_glibc_is_less_than_2_25() {
14	return open_via_syscall(path, oflags, mode);
15	}
16	@@ -203,7 +203,7 @@ pub(crate) fn openat(
17	) -> io::Result<OwnedFd> {
18	// Work around <https://sourceware.org/bugzilla/show_bug.cgi?id=17523>.
19	// glibc versions before 2.25 don't handle `O_TMPFILE` correctly.
20	- #[cfg(all(unix, target_env = "gnu", not(target_os = "hurd")))]
21	+ #[cfg(all(unix, target_env = "gnu", not(any(target_os = "freebsd", target_os = "hurd"))))]
22	if oflags.contains(OFlags::TMPFILE) && crate::backend::if_glibc_is_less_than_2_25() {
23	return openat_via_syscall(dirfd, path, oflags, mode);
24	}

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

(-)b/lang/rust/files/patch-vendor_cc_src_tool.rs (-12 / +9 lines)
8		8
9	https://reviews.llvm.org/D77776	9	https://reviews.llvm.org/D77776
10		10
11	--- vendor/cc/src/lib.rs.orig 2021-03-04 20:58:54 UTC	11	--- vendor/cc/src/tool.rs.orig 2024-03-18 11:23:17 UTC
12	+++ vendor/cc/src/lib.rs	12	+++ vendor/cc/src/tool.rs
13	@@ -2659,24 +2659,7 @@ impl Tool {	13	@@ -122,22 +122,7 @@ impl Tool {
14	}	14	};
15		15
16	fn with_features(path: PathBuf, clang_driver: Option<&str>, cuda: bool) -> Self {	16	// Try to detect family of the tool from its name, falling back to Gnu.
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()) {	17	- let family = if let Some(fname) = path.file_name().and_then(\|p\| p.to_str()) {
19	- if fname.contains("clang-cl") {	18	- if fname.contains("clang-cl") {
20	- ToolFamily::Msvc { clang_cl: true }	19	- ToolFamily::Msvc { clang_cl: true }
Lines 26-38 https://reviews.llvm.org/D77776 Link Here
26	- _ => ToolFamily::Clang,	25	- _ => ToolFamily::Clang,
27	- }	26	- }
28	- } else {	27	- } else {
29	- ToolFamily::Gnu	28	- detect_family(&path)
30	- }	29	- }
31	- } else {	30	- } else {
32	- ToolFamily::Gnu	31	- detect_family(&path)
33	- };	32	- };
34	-
35	+ let family = ToolFamily::Gnu;	33	+ let family = ToolFamily::Gnu;
		34
36	Tool {	35	Tool {
37	path: path,	36	path,
38	cc_wrapper_path: None,
39	-