pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
rust184: deal with getmmntinfo() on NetBSD.
Module Name: pkgsrc-wip
Committed By: Havard Eidnes <he%NetBSD.org@localhost>
Pushed By: he
Date: Fri Feb 14 23:02:41 2025 +0000
Changeset: 68ff2a4264919e349a962a8235bfd9d3c879a7f7
Modified Files:
rust184/Makefile
rust184/distinfo
Added Files:
rust184/patches/patch-vendor_libc-0.2.155_src_unix_bsd_netbsdlike_netbsd_mod.rs
rust184/patches/patch-vendor_libc-0.2.158_src_unix_bsd_netbsdlike_netbsd_mod.rs
rust184/patches/patch-vendor_libc-0.2.158_src_unix_solarish_mod.rs
rust184/patches/patch-vendor_libc-0.2.159_src_unix_bsd_netbsdlike_netbsd_mod.rs
rust184/patches/patch-vendor_libc-0.2.159_src_unix_solarish_mod.rs
rust184/patches/patch-vendor_libc-0.2.162_src_unix_bsd_netbsdlike_netbsd_mod.rs
rust184/patches/patch-vendor_libc-0.2.162_src_unix_solarish_mod.rs
rust184/patches/patch-vendor_libc-0.2.164_src_unix_bsd_netbsdlike_netbsd_mod.rs
rust184/patches/patch-vendor_libc-0.2.164_src_unix_solarish_mod.rs
Log Message:
rust184: deal with getmmntinfo() on NetBSD.
This applies https://github.com/rust-lang/libc/pull/4265/files
to deal with the versioned data structure / ABI for this libc call.
And while we're at it, carry forward the solaris patch to all
the libc crates built as part of building the rust compiler, as
well as the patch for getmntinfo().
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=68ff2a4264919e349a962a8235bfd9d3c879a7f7
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
rust184/Makefile | 24 ++++++++++++++++++++++
rust184/distinfo | 9 ++++++++
...c-0.2.155_src_unix_bsd_netbsdlike_netbsd_mod.rs | 15 ++++++++++++++
...c-0.2.158_src_unix_bsd_netbsdlike_netbsd_mod.rs | 15 ++++++++++++++
...ch-vendor_libc-0.2.158_src_unix_solarish_mod.rs | 15 ++++++++++++++
...c-0.2.159_src_unix_bsd_netbsdlike_netbsd_mod.rs | 15 ++++++++++++++
...ch-vendor_libc-0.2.159_src_unix_solarish_mod.rs | 15 ++++++++++++++
...c-0.2.162_src_unix_bsd_netbsdlike_netbsd_mod.rs | 15 ++++++++++++++
...ch-vendor_libc-0.2.162_src_unix_solarish_mod.rs | 15 ++++++++++++++
...c-0.2.164_src_unix_bsd_netbsdlike_netbsd_mod.rs | 15 ++++++++++++++
...ch-vendor_libc-0.2.164_src_unix_solarish_mod.rs | 15 ++++++++++++++
11 files changed, 168 insertions(+)
diffs:
diff --git a/rust184/Makefile b/rust184/Makefile
index 68b6a5a521..1f21cbf22b 100644
--- a/rust184/Makefile
+++ b/rust184/Makefile
@@ -440,6 +440,30 @@ CKSUMS+= bec36eddcf41c8639903ea7593751c92251100168241bc5696f8a776a55651fb
CKSUM_CRATES+= vendor/libc-0.2.155
CKSUMS+= 3e550d95419169febf094c425451ca86b12821fa17839b4b0ba7520b145a5820
CKSUMS+= 1cf38d9ddeca5295821b4234e17e1fc749f35b00307bdfdacb24c6892a288ad6
+CKSUMS+= b8d6f089fc8eb2cb59e45335a26c9ce871b846216c9859b553c6b91982f8de33
+CKSUMS+= d8c4a979ce9b406fb63c5aaf2827b616689294331341737fec392b8faa2126fa
+
+CKSUM_CRATES+= vendor/libc-0.2.158
+CKSUMS+= ab09cea2897ecd27fc7e35822dac23d6dcd53f8577c771db3ee8b015e8d82001
+CKSUMS+= a7ecf37f62e4756b30c92a063bac4b84d229947f854dc0bae9e8c8eeb1ecd237
+CKSUMS+= c0c5dfc406d728666010cdc2fe21b0df40547ed20dd7ad0eab65906e103b6d4b
+CKSUMS+= dd2aa95b38dd9afaac3413f6a1af632de77050adf2fea66b8cdbfc8244d1f07e
+
+CKSUM_CRATES+= vendor/libc-0.2.159
+CKSUMS+= bcd6cc980a3b0ccc3d02ac541f62e0815810e4bd7c4d3dd21b9d1a59321e7825
+CKSUMS+= 2580fd73b4af53ec7bbee21cc26354df597f1ec0525ba1fb7e3a80c2e9d82e64
+CKSUMS+= c0c5dfc406d728666010cdc2fe21b0df40547ed20dd7ad0eab65906e103b6d4b
+CKSUMS+= dd2aa95b38dd9afaac3413f6a1af632de77050adf2fea66b8cdbfc8244d1f07e
+
+CKSUM_CRATES+= vendor/libc-0.2.162
+CKSUMS+= b979150c1803d02d5b4776a8d2653397adf24516d11a31e256719e5df051cade
+CKSUMS+= ef92b925a48e2b0730145e1ab2ad2d38e036d3d4ec0ebd045fbe98300ea41197
+
+CKSUM_CRATES+= vendor/libc-0.2.164
+CKSUMS+= febeb36ab9e653e8916c5476c5560b4eb12ea19153bb74fb591e4166afa013eb
+CKSUMS+= 3e6485184f088089937b9435a48969345606477655dab47047b88fd85310513f
+CKSUMS+= fa2ab98267591f4146de3ad41df9017db67e8b5aa436b41224ef155c951114f4
+CKSUMS+= c0ca36dcf36902e1382c8e58ca4024c2b65e28ae1a5f2e3e38cc122779c0d0ca
CKSUM_CRATES+= vendor/zerocopy-0.7.32
CKSUMS+= 2f21f18a4ca1d4be2d997f037158cb21a7421b2ba2cc52f3e4c5f9410197ed27
diff --git a/rust184/distinfo b/rust184/distinfo
index a060705f74..16b4060928 100644
--- a/rust184/distinfo
+++ b/rust184/distinfo
@@ -138,7 +138,16 @@ SHA1 (patch-tests_assembly_targets_targets-elf.rs) = ee7d036c055ed2a2b3b303f381a
SHA1 (patch-tools_rust-analyzer_lib_line-index-src_lib.rs) = 4ed527174447ee23fa81dd6840e18b9949d5a273
SHA1 (patch-vendor_bytecount-0.6.8_src_lib.rs) = df3641afebac2b06dc9d266524e295c461c441d4
SHA1 (patch-vendor_crossbeam-utils-0.8.18_no__atomic.rs) = d4d9288cb199af9bc7e321fbd2b42860aed954ec
+SHA1 (patch-vendor_libc-0.2.155_src_unix_bsd_netbsdlike_netbsd_mod.rs) = 36d927a0c3fd6ef8d211da5389a981e077aedc29
SHA1 (patch-vendor_libc-0.2.155_src_unix_solarish_mod.rs) = 97505b88875aa80fa2b5589b6090237c3786e143
+SHA1 (patch-vendor_libc-0.2.158_src_unix_bsd_netbsdlike_netbsd_mod.rs) = 6ca30a6873bc2ce462a9ed640e72e586b5e7db0b
+SHA1 (patch-vendor_libc-0.2.158_src_unix_solarish_mod.rs) = 194bd1dbbc568cc596ab5c58a7ea3ee5c88a804c
+SHA1 (patch-vendor_libc-0.2.159_src_unix_bsd_netbsdlike_netbsd_mod.rs) = b01f687e13c76d206695290f08b3755e20bd0816
+SHA1 (patch-vendor_libc-0.2.159_src_unix_solarish_mod.rs) = f65ce5d95466eed8a0e082f4ac3766e0c2dac195
+SHA1 (patch-vendor_libc-0.2.162_src_unix_bsd_netbsdlike_netbsd_mod.rs) = cb9c8c1a02db8ab4762a2bd3d0c80b99e88df530
+SHA1 (patch-vendor_libc-0.2.162_src_unix_solarish_mod.rs) = 75e2755f1810246d1428e19289c416cd3a4b399f
+SHA1 (patch-vendor_libc-0.2.164_src_unix_bsd_netbsdlike_netbsd_mod.rs) = bfcd344aa54f059b2f241a4f78fb1662bf084272
+SHA1 (patch-vendor_libc-0.2.164_src_unix_solarish_mod.rs) = c9ad96a7e3ff9b2547ba09d82cfa7b352970b8fb
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/rust184/patches/patch-vendor_libc-0.2.155_src_unix_bsd_netbsdlike_netbsd_mod.rs b/rust184/patches/patch-vendor_libc-0.2.155_src_unix_bsd_netbsdlike_netbsd_mod.rs
new file mode 100644
index 0000000000..1b6c7088be
--- /dev/null
+++ b/rust184/patches/patch-vendor_libc-0.2.155_src_unix_bsd_netbsdlike_netbsd_mod.rs
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Apply https://github.com/rust-lang/libc/pull/4265/files
+to fix getmntinfo() from rust.
+
+--- vendor/libc-0.2.155/src/unix/bsd/netbsdlike/netbsd/mod.rs.orig 2025-02-14 14:04:45.438043897 +0000
++++ vendor/libc-0.2.155/src/unix/bsd/netbsdlike/netbsd/mod.rs
+@@ -3142,6 +3142,7 @@ cfg_if! {
+ if #[cfg(libc_union)] {
+ extern {
+ // these functions use statvfs:
++ #[link_name = "__getmntinfo13"]
+ pub fn getmntinfo(mntbufp: *mut *mut ::statvfs, flags: ::c_int) -> ::c_int;
+ pub fn getvfsstat(buf: *mut statvfs, bufsize: ::size_t, flags: ::c_int) -> ::c_int;
+ }
diff --git a/rust184/patches/patch-vendor_libc-0.2.158_src_unix_bsd_netbsdlike_netbsd_mod.rs b/rust184/patches/patch-vendor_libc-0.2.158_src_unix_bsd_netbsdlike_netbsd_mod.rs
new file mode 100644
index 0000000000..ae1c37f0d1
--- /dev/null
+++ b/rust184/patches/patch-vendor_libc-0.2.158_src_unix_bsd_netbsdlike_netbsd_mod.rs
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Apply https://github.com/rust-lang/libc/pull/4265/files
+to fix getmntinfo() from rust.
+
+--- vendor/libc-0.2.158/src/unix/bsd/netbsdlike/netbsd/mod.rs.orig 2025-02-14 14:04:45.438043897 +0000
++++ vendor/libc-0.2.158/src/unix/bsd/netbsdlike/netbsd/mod.rs
+@@ -3142,6 +3142,7 @@ cfg_if! {
+ if #[cfg(libc_union)] {
+ extern {
+ // these functions use statvfs:
++ #[link_name = "__getmntinfo13"]
+ pub fn getmntinfo(mntbufp: *mut *mut ::statvfs, flags: ::c_int) -> ::c_int;
+ pub fn getvfsstat(buf: *mut statvfs, bufsize: ::size_t, flags: ::c_int) -> ::c_int;
+ }
diff --git a/rust184/patches/patch-vendor_libc-0.2.158_src_unix_solarish_mod.rs b/rust184/patches/patch-vendor_libc-0.2.158_src_unix_solarish_mod.rs
new file mode 100644
index 0000000000..16e07b1b96
--- /dev/null
+++ b/rust184/patches/patch-vendor_libc-0.2.158_src_unix_solarish_mod.rs
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Fix xattr build.
+
+--- vendor/libc-0.2.158/src/unix/solarish/mod.rs.orig 2024-08-29 18:03:17.866520790 +0000
++++ vendor/libc-0.2.158/src/unix/solarish/mod.rs
+@@ -1524,6 +1524,8 @@ pub const EOWNERDEAD: ::c_int = 58;
+ pub const ENOTRECOVERABLE: ::c_int = 59;
+ pub const ENOSTR: ::c_int = 60;
+ pub const ENODATA: ::c_int = 61;
++// This is not supported but is required for xattr
++pub const ENOATTR: ::c_int = ::ENODATA;
+ pub const ETIME: ::c_int = 62;
+ pub const ENOSR: ::c_int = 63;
+ pub const ENONET: ::c_int = 64;
diff --git a/rust184/patches/patch-vendor_libc-0.2.159_src_unix_bsd_netbsdlike_netbsd_mod.rs b/rust184/patches/patch-vendor_libc-0.2.159_src_unix_bsd_netbsdlike_netbsd_mod.rs
new file mode 100644
index 0000000000..ae3f0b88ff
--- /dev/null
+++ b/rust184/patches/patch-vendor_libc-0.2.159_src_unix_bsd_netbsdlike_netbsd_mod.rs
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Apply https://github.com/rust-lang/libc/pull/4265/files
+to fix getmntinfo() from rust.
+
+--- vendor/libc-0.2.159/src/unix/bsd/netbsdlike/netbsd/mod.rs.orig 2025-02-14 14:04:45.438043897 +0000
++++ vendor/libc-0.2.159/src/unix/bsd/netbsdlike/netbsd/mod.rs
+@@ -3142,6 +3142,7 @@ cfg_if! {
+ if #[cfg(libc_union)] {
+ extern {
+ // these functions use statvfs:
++ #[link_name = "__getmntinfo13"]
+ pub fn getmntinfo(mntbufp: *mut *mut ::statvfs, flags: ::c_int) -> ::c_int;
+ pub fn getvfsstat(buf: *mut statvfs, bufsize: ::size_t, flags: ::c_int) -> ::c_int;
+ }
diff --git a/rust184/patches/patch-vendor_libc-0.2.159_src_unix_solarish_mod.rs b/rust184/patches/patch-vendor_libc-0.2.159_src_unix_solarish_mod.rs
new file mode 100644
index 0000000000..1c13d52195
--- /dev/null
+++ b/rust184/patches/patch-vendor_libc-0.2.159_src_unix_solarish_mod.rs
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Fix xattr build.
+
+--- vendor/libc-0.2.159/src/unix/solarish/mod.rs.orig 2024-08-29 18:03:17.866520790 +0000
++++ vendor/libc-0.2.159/src/unix/solarish/mod.rs
+@@ -1524,6 +1524,8 @@ pub const EOWNERDEAD: ::c_int = 58;
+ pub const ENOTRECOVERABLE: ::c_int = 59;
+ pub const ENOSTR: ::c_int = 60;
+ pub const ENODATA: ::c_int = 61;
++// This is not supported but is required for xattr
++pub const ENOATTR: ::c_int = ::ENODATA;
+ pub const ETIME: ::c_int = 62;
+ pub const ENOSR: ::c_int = 63;
+ pub const ENONET: ::c_int = 64;
diff --git a/rust184/patches/patch-vendor_libc-0.2.162_src_unix_bsd_netbsdlike_netbsd_mod.rs b/rust184/patches/patch-vendor_libc-0.2.162_src_unix_bsd_netbsdlike_netbsd_mod.rs
new file mode 100644
index 0000000000..d344f3bdee
--- /dev/null
+++ b/rust184/patches/patch-vendor_libc-0.2.162_src_unix_bsd_netbsdlike_netbsd_mod.rs
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Apply https://github.com/rust-lang/libc/pull/4265/files
+to fix getmntinfo() from rust.
+
+--- vendor/libc-0.2.162/src/unix/bsd/netbsdlike/netbsd/mod.rs.orig 2025-02-14 14:04:45.438043897 +0000
++++ vendor/libc-0.2.162/src/unix/bsd/netbsdlike/netbsd/mod.rs
+@@ -3142,6 +3142,7 @@ cfg_if! {
+ if #[cfg(libc_union)] {
+ extern {
+ // these functions use statvfs:
++ #[link_name = "__getmntinfo13"]
+ pub fn getmntinfo(mntbufp: *mut *mut ::statvfs, flags: ::c_int) -> ::c_int;
+ pub fn getvfsstat(buf: *mut statvfs, bufsize: ::size_t, flags: ::c_int) -> ::c_int;
+ }
diff --git a/rust184/patches/patch-vendor_libc-0.2.162_src_unix_solarish_mod.rs b/rust184/patches/patch-vendor_libc-0.2.162_src_unix_solarish_mod.rs
new file mode 100644
index 0000000000..5225152170
--- /dev/null
+++ b/rust184/patches/patch-vendor_libc-0.2.162_src_unix_solarish_mod.rs
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Fix xattr build.
+
+--- vendor/libc-0.2.162/src/unix/solarish/mod.rs.orig 2024-08-29 18:03:17.866520790 +0000
++++ vendor/libc-0.2.162/src/unix/solarish/mod.rs
+@@ -1524,6 +1524,8 @@ pub const EOWNERDEAD: ::c_int = 58;
+ pub const ENOTRECOVERABLE: ::c_int = 59;
+ pub const ENOSTR: ::c_int = 60;
+ pub const ENODATA: ::c_int = 61;
++// This is not supported but is required for xattr
++pub const ENOATTR: ::c_int = ::ENODATA;
+ pub const ETIME: ::c_int = 62;
+ pub const ENOSR: ::c_int = 63;
+ pub const ENONET: ::c_int = 64;
diff --git a/rust184/patches/patch-vendor_libc-0.2.164_src_unix_bsd_netbsdlike_netbsd_mod.rs b/rust184/patches/patch-vendor_libc-0.2.164_src_unix_bsd_netbsdlike_netbsd_mod.rs
new file mode 100644
index 0000000000..79a37a3f25
--- /dev/null
+++ b/rust184/patches/patch-vendor_libc-0.2.164_src_unix_bsd_netbsdlike_netbsd_mod.rs
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Apply https://github.com/rust-lang/libc/pull/4265/files
+to fix getmntinfo() from rust.
+
+--- vendor/libc-0.2.164/src/unix/bsd/netbsdlike/netbsd/mod.rs.orig 2025-02-14 14:04:45.438043897 +0000
++++ vendor/libc-0.2.164/src/unix/bsd/netbsdlike/netbsd/mod.rs
+@@ -3142,6 +3142,7 @@ cfg_if! {
+ if #[cfg(libc_union)] {
+ extern {
+ // these functions use statvfs:
++ #[link_name = "__getmntinfo13"]
+ pub fn getmntinfo(mntbufp: *mut *mut ::statvfs, flags: ::c_int) -> ::c_int;
+ pub fn getvfsstat(buf: *mut statvfs, bufsize: ::size_t, flags: ::c_int) -> ::c_int;
+ }
diff --git a/rust184/patches/patch-vendor_libc-0.2.164_src_unix_solarish_mod.rs b/rust184/patches/patch-vendor_libc-0.2.164_src_unix_solarish_mod.rs
new file mode 100644
index 0000000000..70b788f245
--- /dev/null
+++ b/rust184/patches/patch-vendor_libc-0.2.164_src_unix_solarish_mod.rs
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Fix xattr build.
+
+--- vendor/libc-0.2.164/src/unix/solarish/mod.rs.orig 2024-08-29 18:03:17.866520790 +0000
++++ vendor/libc-0.2.164/src/unix/solarish/mod.rs
+@@ -1524,6 +1524,8 @@ pub const EOWNERDEAD: ::c_int = 58;
+ pub const ENOTRECOVERABLE: ::c_int = 59;
+ pub const ENOSTR: ::c_int = 60;
+ pub const ENODATA: ::c_int = 61;
++// This is not supported but is required for xattr
++pub const ENOATTR: ::c_int = ::ENODATA;
+ pub const ETIME: ::c_int = 62;
+ pub const ENOSR: ::c_int = 63;
+ pub const ENONET: ::c_int = 64;
Home |
Main Index |
Thread Index |
Old Index