Add more bits for i586 build of rust on NetBSD.

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

Module Name:	pkgsrc-wip
Committed By:	Havard Eidnes <he%NetBSD.org@localhost>
Pushed By:	he
Date:		Mon Apr 12 16:19:33 2021 +0200
Changeset:	70a7c7bd10cb4030661e0af7dadeb440297e65cc

Modified Files:
	rust/Makefile
	rust/cross.mk
	rust/distinfo
	rust/patches/patch-vendor_openssl-src_src_lib.rs

Log Message:
Add more bits for i586 build of rust on NetBSD.

The openssl-sys package needed a patch, and that needed an
updated checksum.  Unfortunately, can so far not cross-build
the i586 bootstrap kit due to issues with -latomic, but I got
a bootstrap kit for testing "cross-built" natively on an i686
host, therefore the updates to cross.mk (also comment out one
overlooked entry from earlier...).

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

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

diffstat:
 rust/Makefile                                    | 6 ++++--
 rust/cross.mk                                    | 3 +++
 rust/distinfo                                    | 2 +-
 rust/patches/patch-vendor_openssl-src_src_lib.rs | 5 +++--
 4 files changed, 11 insertions(+), 5 deletions(-)

diffs:
diff --git a/rust/Makefile b/rust/Makefile
index a1cde654d7..738f3da45c 100644
--- a/rust/Makefile
+++ b/rust/Makefile
@@ -338,7 +338,7 @@ CKSUMS+=	9e146a847e1f726fa7d7eae224aaa925030287f99770f950a012cb398e088d12
 
 CKSUM_CRATES+=	vendor/openssl-src
 CKSUMS+=	03dcdaac7de880b860ecfe859ba2ac3e46c8f46a7bf948aa674147eebee421b0
-CKSUMS+=	41ab6811d4ffde68f245e5097081ba8052a07a4b86df69a356ba11205e7e2210
+CKSUMS+=	58f630b56613c5ba6c03f54f21dc9cb6ee9b32960cf5b44ae25878c77f543f7e
 
 SUBST_CLASSES+=		cksum
 SUBST_STAGE.cksum=	pre-configure
@@ -365,11 +365,13 @@ post-extract:
 	${RM} -f c++-wrap; \
 	${RM} -f clang++-wrap; \
 	${RM} -f clang-wrap; \
+	${RM} -f ar-wrap; \
 	${CP} ${.CURDIR}/files/gcc-wrap .; \
 	${CHMOD} +x gcc-wrap; \
 	${LN} -s gcc-wrap c++-wrap; \
 	${LN} -s gcc-wrap clang++-wrap; \
-	${LN} -s gcc-wrap clang-wrap
+	${LN} -s gcc-wrap clang-wrap; \
+	${LN} -s gcc-wrap ar-wrap
 .endif
 
 .if ${OPSYS} == "FreeBSD"
diff --git a/rust/cross.mk b/rust/cross.mk
index 23dad3343f..95affe752d 100644
--- a/rust/cross.mk
+++ b/rust/cross.mk
@@ -18,6 +18,7 @@
 #CROSS_ROOT=		/u/9.0-macppc
 #CROSS_ROOT=		/u/evbarm64
 #CROSS_ROOT=		/u/i386
+#CROSS_ROOT=		/
 #MAKE_ENV+=		CROSS_ROOT=${CROSS_ROOT}
 
 # The GNU cross target designation
@@ -45,7 +46,9 @@
 #ONFIGURE_ARGS+= 	--set=target.${TARGET}.cc=${SCRIPTS}/gcc-wrap
 #CONFIGURE_ARGS+=	--set=target.${TARGET}.cxx=${SCRIPTS}/c++-wrap
 #CONFIGURE_ARGS+=	--set=target.${TARGET}.linker=${SCRIPTS}/gcc-wrap
+# Pick one:
 #CONFIGURE_ARGS+=	--set=target.${TARGET}.ar=${CROSS_ROOT}/tools/bin/${GNU_CROSS_TARGET}-ar
+#CONFIGURE_ARGS+=	--set=target.${TARGET}.ar=${SCRIPTS}/ar-wrap
 
 # May be required when cross-building on NetBSD
 #MAKE_ENV+=		OPENSSL_DIR=/usr
diff --git a/rust/distinfo b/rust/distinfo
index 88c92f7ce5..73c4a86aa4 100644
--- a/rust/distinfo
+++ b/rust/distinfo
@@ -123,5 +123,5 @@ SHA1 (patch-src_tools_rust-installer_install-template.sh) = f2ec6dced2be1fa23773
 SHA1 (patch-vendor_libc_src_unix_solarish_mod.rs) = 804ea03be546fef0d2bd37d7f8abb26d38a7892b
 SHA1 (patch-vendor_lzma-sys_config.h) = b654c7e129fa02697734bc87173f89b3056a5437
 SHA1 (patch-vendor_net2_src_ext.rs) = 5c34f3eaaa0589eefe14d374d34fadd4900565fd
-SHA1 (patch-vendor_openssl-src_src_lib.rs) = dd79a75e4d570567ac02e8dbb42695682762d9e4
+SHA1 (patch-vendor_openssl-src_src_lib.rs) = b3d728b66600363b5144ff84a34683f80c034d27
 SHA1 (patch-vendor_stacker_src_lib.rs) = 2f4db9971c0558ec7034052c810b8c8be80c4ae3
diff --git a/rust/patches/patch-vendor_openssl-src_src_lib.rs b/rust/patches/patch-vendor_openssl-src_src_lib.rs
index 13eb3aa0b1..fdec682366 100644
--- a/rust/patches/patch-vendor_openssl-src_src_lib.rs
+++ b/rust/patches/patch-vendor_openssl-src_src_lib.rs
@@ -20,15 +20,16 @@ Provide defaults for the various NetBSD targets.
              "asmjs-unknown-emscripten" => "gcc",
              "i586-unknown-linux-gnu" => "linux-elf",
              "i586-unknown-linux-musl" => "linux-elf",
-@@ -188,6 +190,7 @@ impl Build {
+@@ -188,6 +190,8 @@ impl Build {
              "i686-unknown-freebsd" => "BSD-x86-elf",
              "i686-unknown-linux-gnu" => "linux-elf",
              "i686-unknown-linux-musl" => "linux-elf",
 +            "i686-unknown-netbsd" => "BSD-x86-elf",
++            "i586-unknown-netbsd" => "BSD-x86-elf",
              "mips-unknown-linux-gnu" => "linux-mips32",
              "mips-unknown-linux-musl" => "linux-mips32",
              "mips64-unknown-linux-gnuabi64" => "linux64-mips64",
-@@ -195,12 +198,14 @@ impl Build {
+@@ -195,12 +199,14 @@ impl Build {
              "mipsel-unknown-linux-gnu" => "linux-mips32",
              "mipsel-unknown-linux-musl" => "linux-mips32",
              "powerpc-unknown-linux-gnu" => "linux-ppc",