pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
rust192: transform the riscv64.rs patches so that this builds again.
Module Name: pkgsrc-wip
Committed By: Havard Eidnes <he%NetBSD.org@localhost>
Pushed By: he
Date: Sun Dec 14 19:19:44 2025 +0000
Changeset: da23380851fd106391a6a69171b4c0cfa9b6ddae
Modified Files:
rust192/Makefile
rust192/distinfo
rust192/patches/patch-vendor_libc-0.2.175_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
rust192/patches/patch-vendor_libc-0.2.177_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
Added Files:
rust192/patches/patch-vendor_libc-0.2.176_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
Log Message:
rust192: transform the riscv64.rs patches so that this builds again.
(...I really should get these submitted upstream, should I not? ...)
At least they don't look horrible now, even though they are
... written as error-message-based development.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=da23380851fd106391a6a69171b4c0cfa9b6ddae
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
rust192/Makefile | 9 ++-
rust192/distinfo | 5 +-
...2.175_src_unix_bsd_netbsdlike_netbsd_riscv64.rs | 58 ++++++++----------
...2.176_src_unix_bsd_netbsdlike_netbsd_riscv64.rs | 70 ++++++++++++++++++++++
...2.177_src_unix_bsd_netbsdlike_netbsd_riscv64.rs | 58 ++++++++----------
5 files changed, 128 insertions(+), 72 deletions(-)
diffs:
diff --git a/rust192/Makefile b/rust192/Makefile
index ce0cec987b..556aa37cad 100644
--- a/rust192/Makefile
+++ b/rust192/Makefile
@@ -513,12 +513,17 @@ CKSUMS+= 2dc054435fd2976536b6685d66ba6796d4eb143885bd573e686e9b042ae7257a
CKSUM_CRATES+= vendor/libc-0.2.175
CKSUMS+= efa1a156cff1ab2450439adbb3ab2113bed6b7de2205c99e9cba875aa2b1c153
-CKSUMS+= a7287f4e6e63cbd2d28ad5665b6515eaab5098ef063ede73b14ed7c7a76732ee
+CKSUMS+= 72e7d62f37e923fbd255fdae54006f1eb13192a045fbc7dce943327cb3a87230
+
+CKSUM_CRATES+= vendor/libc-0.2.176
+# covered by libc-0.2.175
+#CKSUMS+= efa1a156cff1ab2450439adbb3ab2113bed6b7de2205c99e9cba875aa2b1c153
+#CKSUMS+= 72e7d62f37e923fbd255fdae54006f1eb13192a045fbc7dce943327cb3a87230
CKSUM_CRATES+= vendor/libc-0.2.177
# covered by libc-0.2.175
#CKSUMS+= efa1a156cff1ab2450439adbb3ab2113bed6b7de2205c99e9cba875aa2b1c153
-#CKSUMS+= a7287f4e6e63cbd2d28ad5665b6515eaab5098ef063ede73b14ed7c7a76732ee
+#CKSUMS+= 72e7d62f37e923fbd255fdae54006f1eb13192a045fbc7dce943327cb3a87230
CKSUM_CRATES+= vendor/zerocopy-0.7.32
CKSUMS+= 2f21f18a4ca1d4be2d997f037158cb21a7421b2ba2cc52f3e4c5f9410197ed27
diff --git a/rust192/distinfo b/rust192/distinfo
index fdf21afd6c..49e612169e 100644
--- a/rust192/distinfo
+++ b/rust192/distinfo
@@ -141,8 +141,9 @@ SHA1 (patch-vendor_libc-0.2.171_src_unix_bsd_netbsdlike_netbsd_riscv64.rs) = adf
SHA1 (patch-vendor_libc-0.2.172_src_unix_bsd_netbsdlike_netbsd_riscv64.rs) = 3127715d2eb1e0ce148d67323b25dd0bc07b67ad
SHA1 (patch-vendor_libc-0.2.172_src_unix_solarish_mod.rs) = 9365cab6fd25dd077ed56f6105cde22a4a3356dd
SHA1 (patch-vendor_libc-0.2.174_src_unix_bsd_netbsdlike_netbsd_riscv64.rs) = bcfaa5a86f5a5d837cc467dd5ac62434fcedc518
-SHA1 (patch-vendor_libc-0.2.175_src_unix_bsd_netbsdlike_netbsd_riscv64.rs) = 393f7a6ad565bf5ceaa03e12d7b5eecd9bef467a
-SHA1 (patch-vendor_libc-0.2.177_src_unix_bsd_netbsdlike_netbsd_riscv64.rs) = 2cb676288786a14ff90f44c700951a245bd9e27b
+SHA1 (patch-vendor_libc-0.2.175_src_unix_bsd_netbsdlike_netbsd_riscv64.rs) = c37d2c1b5d0dac363d941548fcccd06764ba4b73
+SHA1 (patch-vendor_libc-0.2.176_src_unix_bsd_netbsdlike_netbsd_riscv64.rs) = 1817d3607e3513ae717eb04a46ed71b75de34c0d
+SHA1 (patch-vendor_libc-0.2.177_src_unix_bsd_netbsdlike_netbsd_riscv64.rs) = cb04280ac2f8875be2c84e8413745bb6fae66c08
SHA1 (patch-vendor_line-index-0.1.2_src_lib.rs) = 30aa5c82630ea0e8969abb527c11640712efba1e
SHA1 (patch-vendor_lzma-sys-0.1.20_config.h) = 4849052ddb2f04f539fd7060fc1b43cc3acf99c4
SHA1 (patch-vendor_memchr-2.7.4_src_arch_aarch64_memchr.rs) = 3e17e9f068afe5e812d10bf57fd3f6d4c21baf0b
diff --git a/rust192/patches/patch-vendor_libc-0.2.175_src_unix_bsd_netbsdlike_netbsd_riscv64.rs b/rust192/patches/patch-vendor_libc-0.2.175_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
index ce4be2ccea..27fe3cc40a 100644
--- a/rust192/patches/patch-vendor_libc-0.2.175_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
+++ b/rust192/patches/patch-vendor_libc-0.2.175_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
@@ -8,7 +8,7 @@ for NetBSD/risc64 with this, whereas it did not earlier.
--- vendor/libc-0.2.175/src/unix/bsd/netbsdlike/netbsd/riscv64.rs.orig 2025-11-02 16:57:14.244169978 +0000
+++ vendor/libc-0.2.175/src/unix/bsd/netbsdlike/netbsd/riscv64.rs
-@@ -1,16 +1,16 @@
+@@ -1,27 +1,58 @@
-use PT_FIRSTMACH;
+use crate::PT_FIRSTMACH;
@@ -28,58 +28,48 @@ for NetBSD/risc64 with this, whereas it did not earlier.
__spare: [crate::__greg_t; 7],
}
}
-@@ -22,6 +22,55 @@ s_no_extra_traits! {
- }
- }
+-s_no_extra_traits! {
+- pub union __fpreg {
+- pub u_u64: u64,
+- pub u_d: c_double,
++#[derive(Clone,Copy)]
++pub union __fpreg {
++ pub u_u64: u64,
++ pub u_d: c_double,
++}
++
+cfg_if! {
+ if #[cfg(feature = "extra_traits")] {
-+// use ::self::fmt;
-+// use ::self::hash;
-+ use core::marker::Copy;
-+ use core::clone::Clone;
-+ #[cfg(libc_union)]
+ impl PartialEq for __fpreg {
+ fn eq(&self, other: &__fpreg) -> bool {
+ unsafe {
-+ self.u_64 == other.u_64
++ self.u_u64 == other.u_u64
+ || self.u_d == other.u_d
+ }
+ }
+ }
-+ #[cfg(libc_union)]
+ impl Eq for __fpreg {}
-+ #[cfg(libc_union)]
-+ impl ::fmt::Debug for __fpreg {
-+ fn fmt(&self, f: &mut ::fmt::Formatter) -> ::fmt::Result {
++ impl hash::Hash for __fpreg {
++ fn hash<H: hash::Hasher>(&self, state: &mut H) {
+ unsafe {
-+ f.debug_struct("__fpreg")
-+ .field("u_u64", &self.u_64)
-+ .field("u_d", &self.u_d)
-+ .finish()
++ self.u_u64.hash(state);
+ }
+ }
+ }
-+ #[cfg(libc_union)]
-+ impl ::hash::Hash for __fpreg {
-+ fn hash<H: ::hash::Hasher>(&self, state: &mut H) {
++ impl fmt::Debug for __fpreg {
++ fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+ unsafe {
-+ self.u_64.hash(state);
-+ self.u_d.hash(state);
++ f.debug_struct("__fpreg")
++ .field("u_u64", &self.u_u64)
++ .field("u_d", &self.u_d)
++ .finish()
+ }
+ }
+ }
-+ #[cfg(libc_union)]
-+ impl ::Copy for __fpreg {}
-+ #[cfg(libc_union)]
-+ impl ::Clone for __fpreg {
-+ fn clone(&self) -> __fpreg {
-+ *self
-+ }
-+ }
-+ }
-+}
-+
+ }
+ }
+
+
pub(crate) const _ALIGNBYTES: usize = size_of::<c_long>() - 1;
diff --git a/rust192/patches/patch-vendor_libc-0.2.176_src_unix_bsd_netbsdlike_netbsd_riscv64.rs b/rust192/patches/patch-vendor_libc-0.2.176_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
new file mode 100644
index 0000000000..31b0c02eb4
--- /dev/null
+++ b/rust192/patches/patch-vendor_libc-0.2.176_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
@@ -0,0 +1,70 @@
+$NetBSD$
+
+--- vendor/libc-0.2.176/src/unix/bsd/netbsdlike/netbsd/riscv64.rs.orig 2025-12-14 09:45:59.454696633 +0000
++++ vendor/libc-0.2.176/src/unix/bsd/netbsdlike/netbsd/riscv64.rs
+@@ -1,27 +1,58 @@
+-use PT_FIRSTMACH;
++use crate::PT_FIRSTMACH;
+
+ use crate::prelude::*;
+
+ pub type __greg_t = u64;
+ pub type __cpu_simple_lock_nv_t = c_int;
+ pub type __gregset = [__greg_t; _NGREG];
+-pub type __fregset = [__freg; _NFREG];
++pub type __fpregset = [__fpreg; _NFREG];
+
+ s! {
+ pub struct mcontext_t {
+ pub __gregs: __gregset,
+- pub __fregs: __fpregset,
++ pub __fpregs: __fpregset,
+ __spare: [crate::__greg_t; 7],
+ }
+ }
+
+-s_no_extra_traits! {
+- pub union __fpreg {
+- pub u_u64: u64,
+- pub u_d: c_double,
++#[derive(Clone,Copy)]
++pub union __fpreg {
++ pub u_u64: u64,
++ pub u_d: c_double,
++}
++
++cfg_if! {
++ if #[cfg(feature = "extra_traits")] {
++ impl PartialEq for __fpreg {
++ fn eq(&self, other: &__fpreg) -> bool {
++ unsafe {
++ self.u_u64 == other.u_u64
++ || self.u_d == other.u_d
++ }
++ }
++ }
++ impl Eq for __fpreg {}
++ impl hash::Hash for __fpreg {
++ fn hash<H: hash::Hasher>(&self, state: &mut H) {
++ unsafe {
++ self.u_u64.hash(state);
++ }
++ }
++ }
++ impl fmt::Debug for __fpreg {
++ fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
++ unsafe {
++ f.debug_struct("__fpreg")
++ .field("u_u64", &self.u_u64)
++ .field("u_d", &self.u_d)
++ .finish()
++ }
++ }
++ }
+ }
+ }
+
++
+ pub(crate) const _ALIGNBYTES: usize = size_of::<c_long>() - 1;
+
+ pub const PT_GETREGS: c_int = PT_FIRSTMACH + 0;
diff --git a/rust192/patches/patch-vendor_libc-0.2.177_src_unix_bsd_netbsdlike_netbsd_riscv64.rs b/rust192/patches/patch-vendor_libc-0.2.177_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
index 9270848abc..a1a4febf26 100644
--- a/rust192/patches/patch-vendor_libc-0.2.177_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
+++ b/rust192/patches/patch-vendor_libc-0.2.177_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
@@ -2,7 +2,7 @@ $NetBSD$
--- vendor/libc-0.2.177/src/unix/bsd/netbsdlike/netbsd/riscv64.rs.orig 2025-12-14 06:33:12.291690472 +0000
+++ vendor/libc-0.2.177/src/unix/bsd/netbsdlike/netbsd/riscv64.rs
-@@ -1,16 +1,16 @@
+@@ -1,27 +1,58 @@
-use PT_FIRSTMACH;
+use crate::PT_FIRSTMACH;
@@ -22,58 +22,48 @@ $NetBSD$
__spare: [crate::__greg_t; 7],
}
}
-@@ -22,6 +22,55 @@ s_no_extra_traits! {
- }
- }
+-s_no_extra_traits! {
+- pub union __fpreg {
+- pub u_u64: u64,
+- pub u_d: c_double,
++#[derive(Clone,Copy)]
++pub union __fpreg {
++ pub u_u64: u64,
++ pub u_d: c_double,
++}
++
+cfg_if! {
+ if #[cfg(feature = "extra_traits")] {
-+// use ::self::fmt;
-+// use ::self::hash;
-+ use core::marker::Copy;
-+ use core::clone::Clone;
-+ #[cfg(libc_union)]
+ impl PartialEq for __fpreg {
+ fn eq(&self, other: &__fpreg) -> bool {
+ unsafe {
-+ self.u_64 == other.u_64
++ self.u_u64 == other.u_u64
+ || self.u_d == other.u_d
+ }
+ }
+ }
-+ #[cfg(libc_union)]
+ impl Eq for __fpreg {}
-+ #[cfg(libc_union)]
-+ impl ::fmt::Debug for __fpreg {
-+ fn fmt(&self, f: &mut ::fmt::Formatter) -> ::fmt::Result {
++ impl hash::Hash for __fpreg {
++ fn hash<H: hash::Hasher>(&self, state: &mut H) {
+ unsafe {
-+ f.debug_struct("__fpreg")
-+ .field("u_u64", &self.u_64)
-+ .field("u_d", &self.u_d)
-+ .finish()
++ self.u_u64.hash(state);
+ }
+ }
+ }
-+ #[cfg(libc_union)]
-+ impl ::hash::Hash for __fpreg {
-+ fn hash<H: ::hash::Hasher>(&self, state: &mut H) {
++ impl fmt::Debug for __fpreg {
++ fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+ unsafe {
-+ self.u_64.hash(state);
-+ self.u_d.hash(state);
++ f.debug_struct("__fpreg")
++ .field("u_u64", &self.u_u64)
++ .field("u_d", &self.u_d)
++ .finish()
+ }
+ }
+ }
-+ #[cfg(libc_union)]
-+ impl ::Copy for __fpreg {}
-+ #[cfg(libc_union)]
-+ impl ::Clone for __fpreg {
-+ fn clone(&self) -> __fpreg {
-+ *self
-+ }
-+ }
-+ }
-+}
-+
+ }
+ }
+
+
pub(crate) const _ALIGNBYTES: usize = size_of::<c_long>() - 1;
Home |
Main Index |
Thread Index |
Old Index