Date: Thu, 2 Feb 2023 13:46:06 GMT From: Piotr Kubaj <pkubaj@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 91c0d1c49f9f - main - sysutils/fselect: add upstream commit that fixes armv7 Message-ID: <202302021346.312Dk61M090935@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=91c0d1c49f9f31c2122aca54b822535f0f94c630 commit 91c0d1c49f9f31c2122aca54b822535f0f94c630 Author: Piotr Kubaj <pkubaj@FreeBSD.org> AuthorDate: 2023-02-02 13:46:04 +0000 Commit: Piotr Kubaj <pkubaj@FreeBSD.org> CommitDate: 2023-02-02 13:46:04 +0000 sysutils/fselect: add upstream commit that fixes armv7 It also fixes build on powerpc. --- ...crates_rustix-0.34.6_src_imp_libc_net_syscalls.rs | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/sysutils/fselect/files/patch-cargo-crates_rustix-0.34.6_src_imp_libc_net_syscalls.rs b/sysutils/fselect/files/patch-cargo-crates_rustix-0.34.6_src_imp_libc_net_syscalls.rs new file mode 100644 index 000000000000..b15774f12d70 --- /dev/null +++ b/sysutils/fselect/files/patch-cargo-crates_rustix-0.34.6_src_imp_libc_net_syscalls.rs @@ -0,0 +1,20 @@ +--- cargo-crates/rustix-0.34.6/src/imp/libc/net/syscalls.rs.orig 2023-02-02 13:18:53 UTC ++++ cargo-crates/rustix-0.34.6/src/imp/libc/net/syscalls.rs +@@ -548,11 +548,12 @@ pub(crate) mod sockopt { + return Err(io::Error::INVAL); + } + +- let tv_sec = timeout.as_secs().try_into(); +- #[cfg(not(all(target_arch = "x86_64", target_pointer_width = "32")))] +- let tv_sec = tv_sec.unwrap_or(c::c_long::MAX); +- #[cfg(all(target_arch = "x86_64", target_pointer_width = "32"))] +- let tv_sec = tv_sec.unwrap_or(i64::MAX); ++ // Rust's musl libc bindings deprecated `time_t` while they ++ // transition to 64-bit `time_t`. What we want here is just ++ // "whatever type `timeval`'s `tv_sec` is", so we're ok using ++ // the deprecated type. ++ #[allow(deprecated)] ++ let tv_sec = timeout.as_secs().try_into().unwrap_or(c::time_t::MAX); + + // `subsec_micros` rounds down, so we use `subsec_nanos` and + // manually round up.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202302021346.312Dk61M090935>