rust: unify end results so we can share checksums.

[Havard Eidnes <he%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Havard Eidnes <he%NetBSD.org@localhost>
Pushed By:	he
Date:		Tue Mar 21 14:46:21 2023 +0000
Changeset:	6f2be03e5ed752da80effc952e43a2da14dd8911

Modified Files:
	rust/Makefile
	rust/distinfo
	rust/patches/patch-vendor_crossbeam-epoch_no__atomic.rs
	rust/patches/patch-vendor_crossbeam-utils_no__atomic.rs

Log Message:
rust: unify end results so we can share checksums.

Having essentially the same file contents in multiple vendored
packages which need to be patched poses its own challenges...

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=6f2be03e5ed752da80effc952e43a2da14dd8911

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 rust/Makefile                                           | 13 ++++---------
 rust/distinfo                                           |  4 ++--
 rust/patches/patch-vendor_crossbeam-epoch_no__atomic.rs | 17 +++++++++++++++--
 rust/patches/patch-vendor_crossbeam-utils_no__atomic.rs | 15 ++++++++++++++-
 4 files changed, 35 insertions(+), 14 deletions(-)

diffs:
diff --git a/rust/Makefile b/rust/Makefile
index c9e1ec848d..505340fcbe 100644
--- a/rust/Makefile
+++ b/rust/Makefile
@@ -449,19 +449,14 @@ CKSUM_CRATES+=	vendor/kqueue
 CKSUMS+=	900a966152b8fdccc4e953df94fa27024cb473f57f49df06cd8f2acaac869787
 CKSUMS+=	9bf215b1d26d7f12def8cbc3cdc2f89eabe9249f040911c4a44792fb417cc0fd
 
+CKSUM_CRATES+=	vendor/crossbeam-epoch
 CKSUM_CRATES+=	vendor/crossbeam-utils
-CKSUMS+=	3314524d2afa0360c947455a6e6566fb54ebf909c99479ca3b7435741fd3293e
-CKSUMS+=	eaef167dea04efa811cf0d53de98feac6063ec2196eccd315d345ef86c551aaa
-
 CKSUM_CRATES+=	vendor/crossbeam-utils-0.8.12
-CKSUMS+=	f58085b9d0666ccf62e0ae17fb5dae937c0a86fcc55dc0ae04ad8659e696a49c
-CKSUMS+=	ea445a2f85068957d0347fa384c8f9c7c2726a65e930f4352d1b10476cddd851
-
 CKSUM_CRATES+=	vendor/crossbeam-epoch-0.9.11
 CKSUMS+=	3314524d2afa0360c947455a6e6566fb54ebf909c99479ca3b7435741fd3293e
-CKSUMS+=	eaef167dea04efa811cf0d53de98feac6063ec2196eccd315d345ef86c551aaa
-
-CKSUM_CRATES+=	vendor/crossbeam-epoch
+CKSUMS+=	ea445a2f85068957d0347fa384c8f9c7c2726a65e930f4352d1b10476cddd851
+CKSUMS+=	f58085b9d0666ccf62e0ae17fb5dae937c0a86fcc55dc0ae04ad8659e696a49c
+CKSUMS+=	ea445a2f85068957d0347fa384c8f9c7c2726a65e930f4352d1b10476cddd851
 
 CKSUM_CRATES+=	vendor/openssl-src
 CKSUMS+=	40cd1069246b552b04fcdfd13eb77b3a89194192f18c426b77377a78abbfd72f
diff --git a/rust/distinfo b/rust/distinfo
index 413efdb933..4209c2bba8 100644
--- a/rust/distinfo
+++ b/rust/distinfo
@@ -144,9 +144,9 @@ SHA1 (patch-vendor_backtrace_src_symbolize_gimli.rs) = b93148ff72a60a17c6a444f26
 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) = 11d53ba4fd5ea43ca5fe61738a06060cd9b249ee
-SHA1 (patch-vendor_crossbeam-epoch_no__atomic.rs) = ee6294d0cef62e843aa7d4e693cc72b1347ff6e1
+SHA1 (patch-vendor_crossbeam-epoch_no__atomic.rs) = 0b38d2314d9187ab745f2aa426015794c18f206c
 SHA1 (patch-vendor_crossbeam-utils-0.8.12_no__atomic.rs) = f8c579f2cfcd3914504405991b20b3d7df0e685f
-SHA1 (patch-vendor_crossbeam-utils_no__atomic.rs) = de961f08e6636b2fb18920faa0fda951f2c369b4
+SHA1 (patch-vendor_crossbeam-utils_no__atomic.rs) = 074bd55721719275275b35d941bc138670e4d63c
 SHA1 (patch-vendor_kqueue_src_time.rs) = 21950e7d79fb88257bdb11b988f2a3ae0084ba3d
 SHA1 (patch-vendor_libc-0.2.127_src_unix_bsd_netbsdlike_netbsd_mips.rs) = 982f0e22527f425d10e8db88dab8e16d1f495d4d
 SHA1 (patch-vendor_libc-0.2.135_src_unix_bsd_netbsdlike_netbsd_mips.rs) = cf92b264404c9c6822abf4bfea4acdb0e27e3e75
diff --git a/rust/patches/patch-vendor_crossbeam-epoch_no__atomic.rs b/rust/patches/patch-vendor_crossbeam-epoch_no__atomic.rs
index f5716f7dd7..a1c328b6a9 100644
--- a/rust/patches/patch-vendor_crossbeam-epoch_no__atomic.rs
+++ b/rust/patches/patch-vendor_crossbeam-epoch_no__atomic.rs
@@ -2,14 +2,27 @@ $NetBSD$
 
 Add "mipsel-unknown-netbsd" to the list who don't have 
 native 64-bit atomic ops.
+Unify with crossbeam-epoch to get same after-checksum...
 
 --- vendor/crossbeam-epoch/no_atomic.rs.orig	2022-09-19 15:35:01.000000000 +0000
 +++ vendor/crossbeam-epoch/no_atomic.rs
-@@ -36,6 +36,7 @@ const NO_ATOMIC_64: &[&str] = &[
+@@ -37,10 +37,10 @@ const NO_ATOMIC_64: &[&str] = &[
+     "mips-unknown-linux-musl",
+     "mips-unknown-linux-uclibc",
+     "mipsel-sony-psp",
+-    "mipsel-sony-psx",
+     "mipsel-unknown-linux-gnu",
      "mipsel-unknown-linux-musl",
      "mipsel-unknown-linux-uclibc",
-     "mipsel-unknown-none",
 +    "mipsel-unknown-netbsd",
+     "mipsel-unknown-none",
      "mipsisa32r6-unknown-linux-gnu",
      "mipsisa32r6el-unknown-linux-gnu",
+@@ -74,7 +74,6 @@ const NO_ATOMIC_64: &[&str] = &[
+ #[allow(dead_code)] // Only crossbeam-utils uses this.
+ const NO_ATOMIC: &[&str] = &[
+     "avr-unknown-gnu-atmega328",
+-    "mipsel-sony-psx",
      "msp430-none-elf",
+     "riscv32i-unknown-none-elf",
+     "riscv32im-unknown-none-elf",
diff --git a/rust/patches/patch-vendor_crossbeam-utils_no__atomic.rs b/rust/patches/patch-vendor_crossbeam-utils_no__atomic.rs
index 03888f5d91..0599e22440 100644
--- a/rust/patches/patch-vendor_crossbeam-utils_no__atomic.rs
+++ b/rust/patches/patch-vendor_crossbeam-utils_no__atomic.rs
@@ -1,10 +1,15 @@
 $NetBSD$
 
 Add mipsel-unknown-netbsd target as not having 64-bit atomics.
+Unify with crossbeam-utils-0.8.12 by removing mipsel-sony-psx.
 
 --- 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] = &[
+@@ -37,10 +37,10 @@ const NO_ATOMIC_64: &[&str] = &[
+     "mips-unknown-linux-musl",
+     "mips-unknown-linux-uclibc",
+     "mipsel-sony-psp",
+-    "mipsel-sony-psx",
      "mipsel-unknown-linux-gnu",
      "mipsel-unknown-linux-musl",
      "mipsel-unknown-linux-uclibc",
@@ -12,3 +17,11 @@ Add mipsel-unknown-netbsd target as not having 64-bit atomics.
      "mipsel-unknown-none",
      "mipsisa32r6-unknown-linux-gnu",
      "mipsisa32r6el-unknown-linux-gnu",
+@@ -74,7 +74,6 @@ const NO_ATOMIC_64: &[&str] = &[
+ #[allow(dead_code)] // Only crossbeam-utils uses this.
+ const NO_ATOMIC: &[&str] = &[
+     "avr-unknown-gnu-atmega328",
+-    "mipsel-sony-psx",
+     "msp430-none-elf",
+     "riscv32i-unknown-none-elf",
+     "riscv32im-unknown-none-elf",