CVS commit: pkgsrc/devel/jj
"Havard Eidnes" <[email protected]>
| Newsgroups | gmane.os.netbsd.devel.pkgsrc.cvs |
|---|---|
| Message-ID | <[email protected]> |
Module Name: pkgsrc
Committed By: he
Date: Sat Aug 15 19:26:07 UTC 2026
Modified Files:
pkgsrc/devel/jj: distinfo
Added Files:
pkgsrc/devel/jj/patches:
patch-.._vendor_serde__bser-0.4.0_src_ser_mod.rs
Log Message:
devel/jj: add a patch to fix the build on big-endian hosts.
This applies the change from this upstream pull request:
https://github.com/facebook/watchman/pull/1238
Admittedly I'm not able to figure out which version of the
serde_bser crate has the fix and why it's not in devel/jj: the
crate appears to be version 0.4.0 both in devel/jj and at the head
of the github development branch, and this fix is in one but
not the other.
Reported upstream at https://github.com/jj-vcs/jj/issues/9992.
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 pkgsrc/devel/jj/distinfo
cvs rdiff -u -r0 -r1.1 \
pkgsrc/devel/jj/patches/patch-.._vendor_serde__bser-0.4.0_src_ser_mod.rs
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
(unnamed)
(text/x-diff, 2.7 KB)
Modified files: Index: pkgsrc/devel/jj/distinfo diff -u pkgsrc/devel/jj/distinfo:1.37 pkgsrc/devel/jj/distinfo:1.38 --- pkgsrc/devel/jj/distinfo:1.37 Thu Aug 6 13:44:44 2026 +++ pkgsrc/devel/jj/distinfo Sat Aug 15 19:26:07 2026 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.37 2026/08/06 13:44:44 adam Exp $ +$NetBSD: distinfo,v 1.38 2026/08/15 19:26:07 he Exp $ BLAKE2s (ahash-0.8.12.crate) = 157e4e2836883526fa391419f08c2aa4c932fb96ddf2b254bb436193691754c4 SHA512 (ahash-0.8.12.crate) = 872e5fa0d1334abac96d10eca18f32c2b1a1e0b38671c132b6effd029e9f0147ddcef79f4d85c8baf0537ddfb8c39a85f61d073e1fb3143dba659a8385641e1b @@ -1630,3 +1630,4 @@ BLAKE2s (zmij-1.0.21.crate) = a2d1e72142 SHA512 (zmij-1.0.21.crate) = a488f11ec8721ddfe42e61d028a128818551de8fccd69d7824504e4ae2efccdc38f716fa5a10ef4de07a8a087e75e819c4a1e0790817e8539b5db697bde14585 Size (zmij-1.0.21.crate) = 26665 bytes SHA1 (patch-.._vendor_nix-0.29.0_src_net_if__.rs) = ac9072a65be112e8ea12db9a7c7340da57900e19 +SHA1 (patch-.._vendor_serde__bser-0.4.0_src_ser_mod.rs) = 378016e9accb5082d624f2a0bba32265c47acbac Added files: Index: pkgsrc/devel/jj/patches/patch-.._vendor_serde__bser-0.4.0_src_ser_mod.rs diff -u /dev/null pkgsrc/devel/jj/patches/patch-.._vendor_serde__bser-0.4.0_src_ser_mod.rs:1.1 --- /dev/null Sat Aug 15 19:26:07 2026 +++ pkgsrc/devel/jj/patches/patch-.._vendor_serde__bser-0.4.0_src_ser_mod.rs Sat Aug 15 19:26:07 2026 @@ -0,0 +1,45 @@ +$NetBSD: patch-.._vendor_serde__bser-0.4.0_src_ser_mod.rs,v 1.1 2026/08/15 19:26:07 he Exp $ + +The "bytes" crate used big_endian by "default", so there is +no put_.*_be() functions, only put_.*() functions. Adapt. + +Never built for/on a big-endian target? + +--- ../vendor/serde_bser-0.4.0/src/ser/mod.rs.orig 2026-08-15 14:56:34.645542049 +0000 ++++ ../vendor/serde_bser-0.4.0/src/ser/mod.rs +@@ -133,7 +133,7 @@ where + #[cfg(target_endian = "little")] + self.scratch.put_i16_le(v); + #[cfg(target_endian = "big")] +- self.scratch.put_i16_be(v); ++ self.scratch.put_i16(v); + } + + #[inline] +@@ -143,7 +143,7 @@ where + #[cfg(target_endian = "little")] + self.scratch.put_i32_le(v); + #[cfg(target_endian = "big")] +- self.scratch.put_i32_be(v); ++ self.scratch.put_i32(v); + } + + #[inline] +@@ -153,7 +153,7 @@ where + #[cfg(target_endian = "little")] + self.scratch.put_i64_le(v); + #[cfg(target_endian = "big")] +- self.scratch.put_i64_be(v); ++ self.scratch.put_i64(v); + } + } + +@@ -255,7 +255,7 @@ where + #[cfg(target_endian = "little")] + self.scratch.put_f64_le(v); + #[cfg(target_endian = "big")] +- self.scratch.put_f64_be(v); ++ self.scratch.put_f64(v); + Ok(()) + } +