pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
rust192: use the NetBSD/riscv64 file which passes libc self-tests.
Module Name: pkgsrc-wip
Committed By: Havard Eidnes <he%NetBSD.org@localhost>
Pushed By: he
Date: Sun Dec 28 23:08:25 2025 +0000
Changeset: b4846798e1e0eca88d59f9f0d7dd4b35da6259ac
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.176_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.175_src_unix_bsd_netbsdlike_netbsd_mod.rs
rust192/patches/patch-vendor_libc-0.2.176_src_unix_bsd_netbsdlike_netbsd_mod.rs
rust192/patches/patch-vendor_libc-0.2.177_src_unix_bsd_netbsdlike_netbsd_mod.rs
Log Message:
rust192: use the NetBSD/riscv64 file which passes libc self-tests.
Also change how NetBSD defines pthread_spin_t, use __pthread_spin_t
which is typically arch-defined via __cpu_simple_lock_nv_t.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=b4846798e1e0eca88d59f9f0d7dd4b35da6259ac
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
rust192/Makefile | 12 +++--
rust192/distinfo | 9 ++--
...c-0.2.175_src_unix_bsd_netbsdlike_netbsd_mod.rs | 16 +++++++
...2.175_src_unix_bsd_netbsdlike_netbsd_riscv64.rs | 52 ++++++++++++----------
...c-0.2.176_src_unix_bsd_netbsdlike_netbsd_mod.rs | 16 +++++++
...2.176_src_unix_bsd_netbsdlike_netbsd_riscv64.rs | 52 ++++++++++++----------
...c-0.2.177_src_unix_bsd_netbsdlike_netbsd_mod.rs | 16 +++++++
...2.177_src_unix_bsd_netbsdlike_netbsd_riscv64.rs | 52 ++++++++++++----------
8 files changed, 147 insertions(+), 78 deletions(-)
diffs:
diff --git a/rust192/Makefile b/rust192/Makefile
index ecab0dd134..789208baab 100644
--- a/rust192/Makefile
+++ b/rust192/Makefile
@@ -513,17 +513,23 @@ CKSUMS+= 2dc054435fd2976536b6685d66ba6796d4eb143885bd573e686e9b042ae7257a
CKSUM_CRATES+= vendor/libc-0.2.175
CKSUMS+= efa1a156cff1ab2450439adbb3ab2113bed6b7de2205c99e9cba875aa2b1c153
-CKSUMS+= 042402fb875f0ef56a7344bb1404c7ad8e559caa9e458fe4d8c4657a278bda8a
+CKSUMS+= 380d59961b454a674ac6f484056bd13300263d07498c7b76abab902cffae7112
+CKSUMS+= 40c61bfb238ba988391cabe55e389c33e7adce7cf1cdd8a6db56406401f566e3
+CKSUMS+= 65fe8c348242f176decd9c71be8dfce0baa005e7cb0cab2f3d2a05dae2593ecd
CKSUM_CRATES+= vendor/libc-0.2.176
# covered by libc-0.2.175
#CKSUMS+= efa1a156cff1ab2450439adbb3ab2113bed6b7de2205c99e9cba875aa2b1c153
-#CKSUMS+= 042402fb875f0ef56a7344bb1404c7ad8e559caa9e458fe4d8c4657a278bda8a
+#CKSUMS+= 380d59961b454a674ac6f484056bd13300263d07498c7b76abab902cffae7112
+CKSUMS+= 14dc0173e4e8da439dab81c4321126cdb64ad2b741714002cc899598b5bbc8bd
+CKSUMS+= 34a90ee9fb79b269e3e4827ae93651c07ffddadb440d74c5140f0735e3d3b64a
CKSUM_CRATES+= vendor/libc-0.2.177
# covered by libc-0.2.175
#CKSUMS+= efa1a156cff1ab2450439adbb3ab2113bed6b7de2205c99e9cba875aa2b1c153
-#CKSUMS+= 042402fb875f0ef56a7344bb1404c7ad8e559caa9e458fe4d8c4657a278bda8a
+#CKSUMS+= 380d59961b454a674ac6f484056bd13300263d07498c7b76abab902cffae7112
+CKSUMS+= 461feb5dc8dddea353ab6d32519045bc9f16525a48449c93dc7148469d94c9c3
+CKSUMS+= 1e67f0a4b668858f9326d47c61e868b2a1293296353b7f43ef8487e572b89513
CKSUM_CRATES+= vendor/zerocopy-0.7.32
CKSUMS+= 2f21f18a4ca1d4be2d997f037158cb21a7421b2ba2cc52f3e4c5f9410197ed27
diff --git a/rust192/distinfo b/rust192/distinfo
index fb40547942..f7c080b92f 100644
--- a/rust192/distinfo
+++ b/rust192/distinfo
@@ -141,9 +141,12 @@ 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) = 341f8e7191df6fd40d4ad6aa1beacce18fe9becd
-SHA1 (patch-vendor_libc-0.2.176_src_unix_bsd_netbsdlike_netbsd_riscv64.rs) = 8f9cd8e6de8d122fc4905defc2d5c02836901261
-SHA1 (patch-vendor_libc-0.2.177_src_unix_bsd_netbsdlike_netbsd_riscv64.rs) = 5d789804d541410b0a190cbb920779551eafad41
+SHA1 (patch-vendor_libc-0.2.175_src_unix_bsd_netbsdlike_netbsd_mod.rs) = e7dc8f13f851e9423f126de7ffce6de5ecb7b74a
+SHA1 (patch-vendor_libc-0.2.175_src_unix_bsd_netbsdlike_netbsd_riscv64.rs) = 9a3e4e6b17c4db74c11f8fb9c56f16fdcd1a886f
+SHA1 (patch-vendor_libc-0.2.176_src_unix_bsd_netbsdlike_netbsd_mod.rs) = a3d0fae468b25c05403493db4397c60afdaa18bb
+SHA1 (patch-vendor_libc-0.2.176_src_unix_bsd_netbsdlike_netbsd_riscv64.rs) = 943761270df2d1437148b25e7512543341e5094f
+SHA1 (patch-vendor_libc-0.2.177_src_unix_bsd_netbsdlike_netbsd_mod.rs) = f1cfcca26c13242377a3419bd87c1c6aec049086
+SHA1 (patch-vendor_libc-0.2.177_src_unix_bsd_netbsdlike_netbsd_riscv64.rs) = 64b6f1ba76ab4318597514929acdb7919654a75e
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_mod.rs b/rust192/patches/patch-vendor_libc-0.2.175_src_unix_bsd_netbsdlike_netbsd_mod.rs
new file mode 100644
index 0000000000..4b32e88f6d
--- /dev/null
+++ b/rust192/patches/patch-vendor_libc-0.2.175_src_unix_bsd_netbsdlike_netbsd_mod.rs
@@ -0,0 +1,16 @@
+$NetBSD$
+
+Use __pthread_spin_t to define pthread_spin_t, not c_uchar which
+isn't universally this type on the various NetBSD targets.
+
+--- vendor/libc-0.2.175/src/unix/bsd/netbsdlike/netbsd/mod.rs.orig 2025-12-28 21:19:19.046785602 +0000
++++ vendor/libc-0.2.175/src/unix/bsd/netbsdlike/netbsd/mod.rs
+@@ -15,7 +15,7 @@ pub type lwpid_t = c_uint;
+ pub type shmatt_t = c_uint;
+ pub type cpuid_t = c_ulong;
+ pub type cpuset_t = _cpuset;
+-pub type pthread_spin_t = c_uchar;
++pub type pthread_spin_t = __pthread_spin_t;
+ pub type timer_t = c_int;
+
+ // elf.h
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 fa4cee7f3d..d78bdc4771 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,43 +8,42 @@ 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,24 +1,59 @@
+@@ -1,28 +1,53 @@
-use PT_FIRSTMACH;
-+use core::clone::Clone;
-+use core::cmp::{
-+ Eq,
-+ PartialEq,
-+};
-+use core::fmt::Debug;
-+use core::marker::Copy;
-
+-
use crate::prelude::*;
+use crate::PT_FIRSTMACH;
pub type __greg_t = u64;
- pub type __cpu_simple_lock_nv_t = c_int;
- pub type __gregset = [__greg_t; _NGREG];
+-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,
+-
+-s! {
+- pub struct mcontext_t {
+- pub __gregs: __gregset,
- pub __fregs: __fpregset,
-+ pub __fpregs: __fpregset,
- __spare: [crate::__greg_t; 7],
- }
+- __spare: [crate::__greg_t; 7],
+- }
++pub union __fpreg {
++ pub u_u64: u64,
++ pub u_d: c_double,
++}
++pub type __cpu_simple_lock_nv_t = c_uint;
++pub type __gregset_t = [__greg_t; _NGREG];
++pub type __fregset_t = [__fpreg; _NFREG];
++
++#[derive(Debug)]
++pub struct mcontext_t {
++ pub __gregs: __gregset_t,
++ pub __fregs: __fregset_t,
++ __spare: [crate::__greg_t; 7],
}
-s_no_extra_traits! {
- pub union __fpreg {
- pub u_u64: u64,
- pub u_d: c_double,
-+pub union __fpreg {
-+ pub u_u64: u64,
-+ pub u_d: c_double,
-+}
-+
+impl core::cmp::PartialEq for __fpreg {
+ fn eq(&self, other: &__fpreg) -> bool {
+ unsafe { self.u_u64 == other.u_u64 || self.u_d == other.u_d }
@@ -75,3 +74,8 @@ for NetBSD/risc64 with this, whereas it did not earlier.
}
}
+-pub(crate) const _ALIGNBYTES: usize = size_of::<c_long>() - 1;
++pub(crate) const _ALIGNBYTES: usize = 0xf;
+
+ pub const PT_GETREGS: c_int = PT_FIRSTMACH + 0;
+ pub const PT_SETREGS: c_int = PT_FIRSTMACH + 1;
diff --git a/rust192/patches/patch-vendor_libc-0.2.176_src_unix_bsd_netbsdlike_netbsd_mod.rs b/rust192/patches/patch-vendor_libc-0.2.176_src_unix_bsd_netbsdlike_netbsd_mod.rs
new file mode 100644
index 0000000000..5a26b4e272
--- /dev/null
+++ b/rust192/patches/patch-vendor_libc-0.2.176_src_unix_bsd_netbsdlike_netbsd_mod.rs
@@ -0,0 +1,16 @@
+$NetBSD$
+
+Use __pthread_spin_t to define pthread_spin_t, not c_uchar which
+isn't universally this type on the various NetBSD targets.
+
+--- vendor/libc-0.2.176/src/unix/bsd/netbsdlike/netbsd/mod.rs.orig 2025-12-28 21:24:27.477712833 +0000
++++ vendor/libc-0.2.176/src/unix/bsd/netbsdlike/netbsd/mod.rs
+@@ -15,7 +15,7 @@ pub type lwpid_t = c_uint;
+ pub type shmatt_t = c_uint;
+ pub type cpuid_t = c_ulong;
+ pub type cpuset_t = _cpuset;
+-pub type pthread_spin_t = c_uchar;
++pub type pthread_spin_t = __pthread_spin_t;
+ pub type timer_t = c_int;
+
+ // elf.h
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
index fedee4fc15..066885cb6d 100644
--- 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
@@ -8,43 +8,42 @@ for NetBSD/risc64 with this, whereas it did not earlier.
--- vendor/libc-0.2.176/src/unix/bsd/netbsdlike/netbsd/riscv64.rs.orig 2025-11-02 16:57:14.244169978 +0000
+++ vendor/libc-0.2.176/src/unix/bsd/netbsdlike/netbsd/riscv64.rs
-@@ -1,24 +1,59 @@
+@@ -1,28 +1,53 @@
-use PT_FIRSTMACH;
-+use core::clone::Clone;
-+use core::cmp::{
-+ Eq,
-+ PartialEq,
-+};
-+use core::fmt::Debug;
-+use core::marker::Copy;
-
+-
use crate::prelude::*;
+use crate::PT_FIRSTMACH;
pub type __greg_t = u64;
- pub type __cpu_simple_lock_nv_t = c_int;
- pub type __gregset = [__greg_t; _NGREG];
+-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,
+-
+-s! {
+- pub struct mcontext_t {
+- pub __gregs: __gregset,
- pub __fregs: __fpregset,
-+ pub __fpregs: __fpregset,
- __spare: [crate::__greg_t; 7],
- }
+- __spare: [crate::__greg_t; 7],
+- }
++pub union __fpreg {
++ pub u_u64: u64,
++ pub u_d: c_double,
++}
++pub type __cpu_simple_lock_nv_t = c_uint;
++pub type __gregset_t = [__greg_t; _NGREG];
++pub type __fregset_t = [__fpreg; _NFREG];
++
++#[derive(Debug)]
++pub struct mcontext_t {
++ pub __gregs: __gregset_t,
++ pub __fregs: __fregset_t,
++ __spare: [crate::__greg_t; 7],
}
-s_no_extra_traits! {
- pub union __fpreg {
- pub u_u64: u64,
- pub u_d: c_double,
-+pub union __fpreg {
-+ pub u_u64: u64,
-+ pub u_d: c_double,
-+}
-+
+impl core::cmp::PartialEq for __fpreg {
+ fn eq(&self, other: &__fpreg) -> bool {
+ unsafe { self.u_u64 == other.u_u64 || self.u_d == other.u_d }
@@ -75,3 +74,8 @@ for NetBSD/risc64 with this, whereas it did not earlier.
}
}
+-pub(crate) const _ALIGNBYTES: usize = size_of::<c_long>() - 1;
++pub(crate) const _ALIGNBYTES: usize = 0xf;
+
+ pub const PT_GETREGS: c_int = PT_FIRSTMACH + 0;
+ pub const PT_SETREGS: c_int = PT_FIRSTMACH + 1;
diff --git a/rust192/patches/patch-vendor_libc-0.2.177_src_unix_bsd_netbsdlike_netbsd_mod.rs b/rust192/patches/patch-vendor_libc-0.2.177_src_unix_bsd_netbsdlike_netbsd_mod.rs
new file mode 100644
index 0000000000..bfe53e213c
--- /dev/null
+++ b/rust192/patches/patch-vendor_libc-0.2.177_src_unix_bsd_netbsdlike_netbsd_mod.rs
@@ -0,0 +1,16 @@
+$NetBSD$
+
+Use __pthread_spin_t to define pthread_spin_t, not c_uchar which
+isn't universally this type on the various NetBSD targets.
+
+--- vendor/libc-0.2.177/src/unix/bsd/netbsdlike/netbsd/mod.rs.orig 2025-12-28 21:32:55.585212755 +0000
++++ vendor/libc-0.2.177/src/unix/bsd/netbsdlike/netbsd/mod.rs
+@@ -15,7 +15,7 @@ pub type lwpid_t = c_uint;
+ pub type shmatt_t = c_uint;
+ pub type cpuid_t = c_ulong;
+ pub type cpuset_t = _cpuset;
+-pub type pthread_spin_t = c_uchar;
++pub type pthread_spin_t = __pthread_spin_t;
+ pub type timer_t = c_int;
+
+ // elf.h
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 beca2c9f18..d221b6801c 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
@@ -8,43 +8,42 @@ for NetBSD/risc64 with this, whereas it did not earlier.
--- vendor/libc-0.2.177/src/unix/bsd/netbsdlike/netbsd/riscv64.rs.orig 2025-11-02 16:57:14.244169978 +0000
+++ vendor/libc-0.2.177/src/unix/bsd/netbsdlike/netbsd/riscv64.rs
-@@ -1,24 +1,59 @@
+@@ -1,28 +1,53 @@
-use PT_FIRSTMACH;
-+use core::clone::Clone;
-+use core::cmp::{
-+ Eq,
-+ PartialEq,
-+};
-+use core::fmt::Debug;
-+use core::marker::Copy;
-
+-
use crate::prelude::*;
+use crate::PT_FIRSTMACH;
pub type __greg_t = u64;
- pub type __cpu_simple_lock_nv_t = c_int;
- pub type __gregset = [__greg_t; _NGREG];
+-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,
+-
+-s! {
+- pub struct mcontext_t {
+- pub __gregs: __gregset,
- pub __fregs: __fpregset,
-+ pub __fpregs: __fpregset,
- __spare: [crate::__greg_t; 7],
- }
+- __spare: [crate::__greg_t; 7],
+- }
++pub union __fpreg {
++ pub u_u64: u64,
++ pub u_d: c_double,
++}
++pub type __cpu_simple_lock_nv_t = c_uint;
++pub type __gregset_t = [__greg_t; _NGREG];
++pub type __fregset_t = [__fpreg; _NFREG];
++
++#[derive(Debug)]
++pub struct mcontext_t {
++ pub __gregs: __gregset_t,
++ pub __fregs: __fregset_t,
++ __spare: [crate::__greg_t; 7],
}
-s_no_extra_traits! {
- pub union __fpreg {
- pub u_u64: u64,
- pub u_d: c_double,
-+pub union __fpreg {
-+ pub u_u64: u64,
-+ pub u_d: c_double,
-+}
-+
+impl core::cmp::PartialEq for __fpreg {
+ fn eq(&self, other: &__fpreg) -> bool {
+ unsafe { self.u_u64 == other.u_u64 || self.u_d == other.u_d }
@@ -75,3 +74,8 @@ for NetBSD/risc64 with this, whereas it did not earlier.
}
}
+-pub(crate) const _ALIGNBYTES: usize = size_of::<c_long>() - 1;
++pub(crate) const _ALIGNBYTES: usize = 0xf;
+
+ pub const PT_GETREGS: c_int = PT_FIRSTMACH + 0;
+ pub const PT_SETREGS: c_int = PT_FIRSTMACH + 1;
Home |
Main Index |
Thread Index |
Old Index