pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
rust: eliminate some pkglint by adding comments.
Module Name: pkgsrc-wip
Committed By: Havard Eidnes <he%NetBSD.org@localhost>
Pushed By: he
Date: Thu Mar 16 08:53:38 2023 +0000
Changeset: 508a2dbc26bf9bbacec4e3def252514da32fb0a1
Modified Files:
rust/distinfo
rust/patches/patch-compiler_rustc__abi_src_layout.rs
rust/patches/patch-compiler_rustc__codegen__ssa_src_mir_place.rs
rust/patches/patch-vendor_crossbeam-epoch-0.9.11_no__atomic.rs
rust/patches/patch-vendor_crossbeam-utils-0.8.12_no__atomic.rs
rust/patches/patch-vendor_crossbeam-utils_no__atomic.rs
rust/patches/patch-vendor_libc-0.2.127_src_unix_bsd_netbsdlike_netbsd_mips.rs
rust/patches/patch-vendor_libc-0.2.127_src_unix_bsd_netbsdlike_netbsd_mod.rs
rust/patches/patch-vendor_libc-0.2.135_src_unix_bsd_netbsdlike_netbsd_mips.rs
rust/patches/patch-vendor_libc-0.2.135_src_unix_bsd_netbsdlike_netbsd_mod.rs
rust/patches/patch-vendor_libc-0.2.137_src_unix_bsd_netbsdlike_netbsd_mod.rs
rust/patches/patch-vendor_nix_src_sys_signal.rs
Log Message:
rust: eliminate some pkglint by adding comments.
Also fix by adding $NetBSD$ to the two new patches,
overlooked earlier.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=508a2dbc26bf9bbacec4e3def252514da32fb0a1
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
rust/distinfo | 22 +++++++++++-----------
.../patch-compiler_rustc__abi_src_layout.rs | 2 ++
...h-compiler_rustc__codegen__ssa_src_mir_place.rs | 2 ++
...tch-vendor_crossbeam-epoch-0.9.11_no__atomic.rs | 2 ++
...tch-vendor_crossbeam-utils-0.8.12_no__atomic.rs | 2 ++
.../patch-vendor_crossbeam-utils_no__atomic.rs | 2 ++
...-0.2.127_src_unix_bsd_netbsdlike_netbsd_mips.rs | 6 ++++--
...c-0.2.127_src_unix_bsd_netbsdlike_netbsd_mod.rs | 2 ++
...-0.2.135_src_unix_bsd_netbsdlike_netbsd_mips.rs | 2 ++
...c-0.2.135_src_unix_bsd_netbsdlike_netbsd_mod.rs | 2 ++
...c-0.2.137_src_unix_bsd_netbsdlike_netbsd_mod.rs | 2 ++
rust/patches/patch-vendor_nix_src_sys_signal.rs | 2 ++
12 files changed, 35 insertions(+), 13 deletions(-)
diffs:
diff --git a/rust/distinfo b/rust/distinfo
index e603301387..e50ea32fa7 100644
--- a/rust/distinfo
+++ b/rust/distinfo
@@ -108,9 +108,9 @@ Size (rust-std-1.66.1-x86_64-unknown-netbsd.tar.xz) = 29173024 bytes
BLAKE2s (rustc-1.67.1-src.tar.gz) = 1a69a94d93083a8a2ebf84854c87bc5b0b994c324602712527c0c77de5b173d4
SHA512 (rustc-1.67.1-src.tar.gz) = d694ecd0f1d674bcc7fc511774705f33c2d9aaef7711c96d66a74cabd6dd66bff5c4fd1aa292c901e1f275e02fb17742b556b3ec0cc4836ae326c1d6339289c7
Size (rustc-1.67.1-src.tar.gz) = 214449596 bytes
-SHA1 (patch-compiler_rustc__abi_src_layout.rs) = 0cc673d1849e5c180533f2d822aca2feaa4ad811
+SHA1 (patch-compiler_rustc__abi_src_layout.rs) = 41b1c08d3b7e0e84c50c3228a2efa55b7717f854
SHA1 (patch-compiler_rustc__codegen__ssa_src_back_linker.rs) = 62819cf6db7d2e3e77d433fe883046c28fc20d91
-SHA1 (patch-compiler_rustc__codegen__ssa_src_mir_place.rs) = c2d268333736ec404e64118fe34b5425cc4be0dd
+SHA1 (patch-compiler_rustc__codegen__ssa_src_mir_place.rs) = 11a93378068985b693e728caffb22ab3c57f7636
SHA1 (patch-compiler_rustc__llvm_build.rs) = 190ff5e38c3a48bb4f11f4f8e5636bdeb36a0230
SHA1 (patch-compiler_rustc__target_src_spec_aarch64__be__unknown__netbsd.rs) = c81d0d288699056ae45569f8d0a1c9bb08153ec4
SHA1 (patch-compiler_rustc__target_src_spec_i586__unknown__netbsd.rs) = 866d01e7c1f3d8dd7d26f2fdc4360df273ed401f
@@ -139,23 +139,23 @@ SHA1 (patch-src_tools_rust-installer_install-template.sh) = ca769db07986ded26d92
SHA1 (patch-vendor_backtrace_src_symbolize_gimli.rs) = b93148ff72a60a17c6a444f2616386c40d872153
SHA1 (patch-vendor_backtrace_src_symbolize_gimli_elf.rs) = 308538090d9ce11d206d6eef0e675581a1fc6e80
SHA1 (patch-vendor_cc_src_lib.rs) = dc40f4fb0f7508b886d6d93b27e9936403a96765
-SHA1 (patch-vendor_crossbeam-epoch-0.9.11_no__atomic.rs) = 9e14b7f56f024781859cbc94be53daef6d96a0b7
+SHA1 (patch-vendor_crossbeam-epoch-0.9.11_no__atomic.rs) = 11d53ba4fd5ea43ca5fe61738a06060cd9b249ee
SHA1 (patch-vendor_crossbeam-epoch-0.9.6_no__atomic.rs) = 96334fb4ceee3332b5f1c7750c93664485b01365
SHA1 (patch-vendor_crossbeam-epoch_no__atomic.rs) = ee6294d0cef62e843aa7d4e693cc72b1347ff6e1
-SHA1 (patch-vendor_crossbeam-utils-0.8.12_no__atomic.rs) = f3ff91232bbc00abee7d8de87909cd670655986e
+SHA1 (patch-vendor_crossbeam-utils-0.8.12_no__atomic.rs) = f8c579f2cfcd3914504405991b20b3d7df0e685f
SHA1 (patch-vendor_crossbeam-utils-0.8.8_no__atomic.rs) = b3c1257f34ff3d43c4b2333bc869abfa77d79ac7
-SHA1 (patch-vendor_crossbeam-utils_no__atomic.rs) = a6eb53457777770083c072bf4c49e971311ce135
+SHA1 (patch-vendor_crossbeam-utils_no__atomic.rs) = de961f08e6636b2fb18920faa0fda951f2c369b4
SHA1 (patch-vendor_kqueue_src_time.rs) = 21950e7d79fb88257bdb11b988f2a3ae0084ba3d
-SHA1 (patch-vendor_libc-0.2.127_src_unix_bsd_netbsdlike_netbsd_mips.rs) = 64d86908ef334e061ba8f1a2b84493f777aedce2
-SHA1 (patch-vendor_libc-0.2.127_src_unix_bsd_netbsdlike_netbsd_mod.rs) = b091cadfd78996452ed5c3012b2022d6b2b4cac1
-SHA1 (patch-vendor_libc-0.2.135_src_unix_bsd_netbsdlike_netbsd_mips.rs) = f33ea5b900a1553b52b628facd2c55a6f468d1bc
-SHA1 (patch-vendor_libc-0.2.135_src_unix_bsd_netbsdlike_netbsd_mod.rs) = ea52d8fbce3bad23ed1b4d016d9f1e447f7b2ac9
-SHA1 (patch-vendor_libc-0.2.137_src_unix_bsd_netbsdlike_netbsd_mod.rs) = a516bc2b50d91d8ab93b7f7684630bad35aa8dde
+SHA1 (patch-vendor_libc-0.2.127_src_unix_bsd_netbsdlike_netbsd_mips.rs) = 982f0e22527f425d10e8db88dab8e16d1f495d4d
+SHA1 (patch-vendor_libc-0.2.127_src_unix_bsd_netbsdlike_netbsd_mod.rs) = 8e53b6df12f51f6ce2d26d8dd3fb9ba9b80e6435
+SHA1 (patch-vendor_libc-0.2.135_src_unix_bsd_netbsdlike_netbsd_mips.rs) = cf92b264404c9c6822abf4bfea4acdb0e27e3e75
+SHA1 (patch-vendor_libc-0.2.135_src_unix_bsd_netbsdlike_netbsd_mod.rs) = 35efba46cfe11bc7fba3dc3b8b6f830cbfa1e81f
+SHA1 (patch-vendor_libc-0.2.137_src_unix_bsd_netbsdlike_netbsd_mod.rs) = c76ac70a95b00c976d54ed7c87ce2ed7386b5fc0
SHA1 (patch-vendor_libc_src_unix_bsd_netbsdlike_netbsd_mips.rs) = 09326b70d7821b1742285c464c70b347400191d7
SHA1 (patch-vendor_libc_src_unix_bsd_netbsdlike_netbsd_mod.rs) = 5b74832fac31de5064eee07e240be4acdbb8606c
SHA1 (patch-vendor_libc_src_unix_solarish_mod.rs) = 8364e19ea09203d32494c37ff3db19fe3d6b9d8a
SHA1 (patch-vendor_lzma-sys_config.h) = b654c7e129fa02697734bc87173f89b3056a5437
-SHA1 (patch-vendor_nix_src_sys_signal.rs) = 9b4499381a94c76c1673f61438eb2db9c86693d6
+SHA1 (patch-vendor_nix_src_sys_signal.rs) = 15a00ef8dad0e6c01137b9dd0a47f2c9f0f4a7c7
SHA1 (patch-vendor_openssl-src_openssl_Configurations_10-main.conf) = 1c4e1d5520776e70d588f3da0fd54b6f956835b5
SHA1 (patch-vendor_openssl-src_src_lib.rs) = 918fac850f3a6e948d25ef3f673ef62345de386f
SHA1 (patch-vendor_openssl-sys_build_main.rs) = 3924efda02e7d8e2115db55b84a7dcc9756e365c
diff --git a/rust/patches/patch-compiler_rustc__abi_src_layout.rs b/rust/patches/patch-compiler_rustc__abi_src_layout.rs
index 2cee146121..364de07779 100644
--- a/rust/patches/patch-compiler_rustc__abi_src_layout.rs
+++ b/rust/patches/patch-compiler_rustc__abi_src_layout.rs
@@ -1,3 +1,5 @@
+$NetBSD$
+
https://github.com/rust-lang/rust/issues/108426
It reverts:
diff --git a/rust/patches/patch-compiler_rustc__codegen__ssa_src_mir_place.rs b/rust/patches/patch-compiler_rustc__codegen__ssa_src_mir_place.rs
index 998212d066..7657514297 100644
--- a/rust/patches/patch-compiler_rustc__codegen__ssa_src_mir_place.rs
+++ b/rust/patches/patch-compiler_rustc__codegen__ssa_src_mir_place.rs
@@ -1,3 +1,5 @@
+$NetBSD$
+
https://github.com/rust-lang/rust/issues/108426
It reverts:
diff --git a/rust/patches/patch-vendor_crossbeam-epoch-0.9.11_no__atomic.rs b/rust/patches/patch-vendor_crossbeam-epoch-0.9.11_no__atomic.rs
index 89722b4e68..26b10edd85 100644
--- a/rust/patches/patch-vendor_crossbeam-epoch-0.9.11_no__atomic.rs
+++ b/rust/patches/patch-vendor_crossbeam-epoch-0.9.11_no__atomic.rs
@@ -1,5 +1,7 @@
$NetBSD$
+Add mipsel-unknown-netbsd target as not having 64-bit atomics.
+
--- vendor/crossbeam-epoch-0.9.11/no_atomic.rs.orig 2023-01-25 01:49:15.000000000 +0000
+++ vendor/crossbeam-epoch-0.9.11/no_atomic.rs
@@ -40,6 +40,7 @@ const NO_ATOMIC_64: &[&str] = &[
diff --git a/rust/patches/patch-vendor_crossbeam-utils-0.8.12_no__atomic.rs b/rust/patches/patch-vendor_crossbeam-utils-0.8.12_no__atomic.rs
index 80b46b365b..6f59a610a9 100644
--- a/rust/patches/patch-vendor_crossbeam-utils-0.8.12_no__atomic.rs
+++ b/rust/patches/patch-vendor_crossbeam-utils-0.8.12_no__atomic.rs
@@ -1,5 +1,7 @@
$NetBSD$
+Add mipsel-unknown-netbsd target as not having 64-bit atomics.
+
--- vendor/crossbeam-utils-0.8.12/no_atomic.rs.orig 2023-01-25 01:49:15.000000000 +0000
+++ vendor/crossbeam-utils-0.8.12/no_atomic.rs
@@ -40,6 +40,7 @@ const NO_ATOMIC_64: &[&str] = &[
diff --git a/rust/patches/patch-vendor_crossbeam-utils_no__atomic.rs b/rust/patches/patch-vendor_crossbeam-utils_no__atomic.rs
index 1c1d2b96d2..03888f5d91 100644
--- a/rust/patches/patch-vendor_crossbeam-utils_no__atomic.rs
+++ b/rust/patches/patch-vendor_crossbeam-utils_no__atomic.rs
@@ -1,5 +1,7 @@
$NetBSD$
+Add mipsel-unknown-netbsd target as not having 64-bit atomics.
+
--- vendor/crossbeam-utils/no_atomic.rs.orig 2023-01-25 01:49:15.000000000 +0000
+++ vendor/crossbeam-utils/no_atomic.rs
@@ -41,6 +41,7 @@ const NO_ATOMIC_64: &[&str] = &[
diff --git a/rust/patches/patch-vendor_libc-0.2.127_src_unix_bsd_netbsdlike_netbsd_mips.rs b/rust/patches/patch-vendor_libc-0.2.127_src_unix_bsd_netbsdlike_netbsd_mips.rs
index bb12f22492..368b4df887 100644
--- a/rust/patches/patch-vendor_libc-0.2.127_src_unix_bsd_netbsdlike_netbsd_mips.rs
+++ b/rust/patches/patch-vendor_libc-0.2.127_src_unix_bsd_netbsdlike_netbsd_mips.rs
@@ -1,7 +1,9 @@
$NetBSD$
---- vendor/libc-0.2.127/src/unix/bsd/netbsdlike/netbsd//mips.rs.orig 2023-01-27 18:20:27.262928858 +0000
-+++ vendor/libc-0.2.127/src/unix/bsd/netbsdlike/netbsd//mips.rs
+Add mipsel-unknown-netbsd target.
+
+--- vendor/libc-0.2.127/src/unix/bsd/netbsdlike/netbsd/mips.rs.orig 2023-01-27 18:20:27.262928858 +0000
++++ vendor/libc-0.2.127/src/unix/bsd/netbsdlike/netbsd/mips.rs
@@ -0,0 +1,22 @@
+use PT_FIRSTMACH;
+
diff --git a/rust/patches/patch-vendor_libc-0.2.127_src_unix_bsd_netbsdlike_netbsd_mod.rs b/rust/patches/patch-vendor_libc-0.2.127_src_unix_bsd_netbsdlike_netbsd_mod.rs
index f74f3f14f6..1623290d1d 100644
--- a/rust/patches/patch-vendor_libc-0.2.127_src_unix_bsd_netbsdlike_netbsd_mod.rs
+++ b/rust/patches/patch-vendor_libc-0.2.127_src_unix_bsd_netbsdlike_netbsd_mod.rs
@@ -1,5 +1,7 @@
$NetBSD$
+Add handling of the NetBSD mips target.
+
--- vendor/libc-0.2.127/src/unix/bsd/netbsdlike/netbsd/mod.rs.orig 2023-01-25 01:49:16.000000000 +0000
+++ vendor/libc-0.2.127/src/unix/bsd/netbsdlike/netbsd/mod.rs
@@ -2990,7 +2990,12 @@ cfg_if! {
diff --git a/rust/patches/patch-vendor_libc-0.2.135_src_unix_bsd_netbsdlike_netbsd_mips.rs b/rust/patches/patch-vendor_libc-0.2.135_src_unix_bsd_netbsdlike_netbsd_mips.rs
index c962c8d86e..eb7643e77e 100644
--- a/rust/patches/patch-vendor_libc-0.2.135_src_unix_bsd_netbsdlike_netbsd_mips.rs
+++ b/rust/patches/patch-vendor_libc-0.2.135_src_unix_bsd_netbsdlike_netbsd_mips.rs
@@ -1,5 +1,7 @@
$NetBSD$
+Add target description for 32-bit mipsel-unknown-netbsd.
+
--- vendor/libc-0.2.135/src/unix/bsd/netbsdlike/netbsd/mips.rs.orig 2023-01-27 19:26:54.068036421 +0000
+++ vendor/libc-0.2.135/src/unix/bsd/netbsdlike/netbsd/mips.rs
@@ -0,0 +1,22 @@
diff --git a/rust/patches/patch-vendor_libc-0.2.135_src_unix_bsd_netbsdlike_netbsd_mod.rs b/rust/patches/patch-vendor_libc-0.2.135_src_unix_bsd_netbsdlike_netbsd_mod.rs
index 2af76129f3..0252cd5945 100644
--- a/rust/patches/patch-vendor_libc-0.2.135_src_unix_bsd_netbsdlike_netbsd_mod.rs
+++ b/rust/patches/patch-vendor_libc-0.2.135_src_unix_bsd_netbsdlike_netbsd_mod.rs
@@ -1,5 +1,7 @@
$NetBSD$
+Add use of NetBSD mips target description.
+
--- vendor/libc-0.2.135/src/unix/bsd/netbsdlike/netbsd/mod.rs.orig 2023-01-25 01:49:16.000000000 +0000
+++ vendor/libc-0.2.135/src/unix/bsd/netbsdlike/netbsd/mod.rs
@@ -3027,7 +3027,12 @@ cfg_if! {
diff --git a/rust/patches/patch-vendor_libc-0.2.137_src_unix_bsd_netbsdlike_netbsd_mod.rs b/rust/patches/patch-vendor_libc-0.2.137_src_unix_bsd_netbsdlike_netbsd_mod.rs
index 5b6f937183..6701a15934 100644
--- a/rust/patches/patch-vendor_libc-0.2.137_src_unix_bsd_netbsdlike_netbsd_mod.rs
+++ b/rust/patches/patch-vendor_libc-0.2.137_src_unix_bsd_netbsdlike_netbsd_mod.rs
@@ -1,5 +1,7 @@
$NetBSD$
+Add handling of NetBSD mips target description.
+
--- vendor/libc-0.2.137/src/unix/bsd/netbsdlike/netbsd/mod.rs.orig 2023-01-25 01:49:16.000000000 +0000
+++ vendor/libc-0.2.137/src/unix/bsd/netbsdlike/netbsd/mod.rs
@@ -3044,7 +3044,12 @@ cfg_if! {
diff --git a/rust/patches/patch-vendor_nix_src_sys_signal.rs b/rust/patches/patch-vendor_nix_src_sys_signal.rs
index 442535e19f..ff15af4f8a 100644
--- a/rust/patches/patch-vendor_nix_src_sys_signal.rs
+++ b/rust/patches/patch-vendor_nix_src_sys_signal.rs
@@ -1,5 +1,7 @@
$NetBSD$
+Narrow the conditional on mips to only apply to Linux.
+
--- vendor/nix/src/sys/signal.rs.orig 2023-01-25 01:49:16.000000000 +0000
+++ vendor/nix/src/sys/signal.rs
@@ -864,7 +864,7 @@ mod sigevent {
Home |
Main Index |
Thread Index |
Old Index