Date: Mon, 03 Aug 2026 15:10:17 +0000 From: Robert Clausecker <fuz@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: d6d822194497 - 2026Q3 - irc/halloy: fix build on armv7 Message-ID: <6a70af59.3b745.2def50da@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch 2026Q3 has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=d6d82219449762075a42991cb38123e93915307f commit d6d82219449762075a42991cb38123e93915307f Author: Robert Clausecker <fuz@FreeBSD.org> AuthorDate: 2026-07-31 09:31:51 +0000 Commit: Robert Clausecker <fuz@FreeBSD.org> CommitDate: 2026-08-03 15:10:08 +0000 irc/halloy: fix build on armv7 The usual issue of time_t being 64 bits on armv7 despite it being a 32 bit platform. Refactor the time conversion code to just use i64 throughout, avoiding any type conversion issues. Approved by: portmgr (build fix blanket) See also: 0c9905d54dedcf8763df802a01beb2ea3d4ac4a0 MFH: 2026Q3 (cherry picked from commit 0075dbc93fe05ae068fbabaed8d356622b391f56) --- .../patch-cargo-crates_cpal-0.17.3_src_host_alsa_mod.rs | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/irc/halloy/files/patch-cargo-crates_cpal-0.17.3_src_host_alsa_mod.rs b/irc/halloy/files/patch-cargo-crates_cpal-0.17.3_src_host_alsa_mod.rs new file mode 100644 index 000000000000..9b3b91695d05 --- /dev/null +++ b/irc/halloy/files/patch-cargo-crates_cpal-0.17.3_src_host_alsa_mod.rs @@ -0,0 +1,15 @@ +--- cargo-crates/cpal-0.17.3/src/host/alsa/mod.rs.orig 2026-05-19 22:15:41 UTC ++++ cargo-crates/cpal-0.17.3/src/host/alsa/mod.rs +@@ -1106,11 +1106,8 @@ fn timespec_to_nanos(ts: libc::timespec) -> i64 { + // https://fossies.org/linux/alsa-lib/test/audio_time.c + #[inline] + fn timespec_to_nanos(ts: libc::timespec) -> i64 { +- let nanos = ts.tv_sec * 1_000_000_000 + ts.tv_nsec; +- #[cfg(target_pointer_width = "64")] ++ let nanos = ts.tv_sec as i64 * 1_000_000_000 + ts.tv_nsec as i64; + return nanos; +- #[cfg(not(target_pointer_width = "64"))] +- return nanos.into(); + } + + // Adapted from `timediff` here:home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a70af59.3b745.2def50da>