rust: pick up jperkin@'s change to not buildlink libssh2. Also:

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

Module Name:	pkgsrc-wip
Committed By:	Havard Eidnes <he%NetBSD.org@localhost>
Pushed By:	he
Date:		Tue Jul 4 18:27:58 2023 +0000
Changeset:	87b5a2490cab3a6e98d065219daeb849e0c183dc

Modified Files:
	rust/Makefile
	rust/cross.mk
	rust/distinfo
	rust/do-cross.mk
	rust/patches/patch-vendor_openssl-sys_build_find__normal.rs
	rust/patches/patch-vendor_rustc-ap-rustc__target_src_spec_aarch64__be__unknown__netbsd.rs

Log Message:
rust: pick up jperkin@'s change to not buildlink libssh2.  Also:

 * ensure pkglint is happy about the start of the patch files
 * fix a few minor typos (missing =, space instead of tab etc.)
 * re-compute patch checksums

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

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

diffstat:
 rust/Makefile                                                    | 9 +++++----
 rust/cross.mk                                                    | 2 +-
 rust/distinfo                                                    | 4 ++--
 rust/do-cross.mk                                                 | 2 +-
 rust/patches/patch-vendor_openssl-sys_build_find__normal.rs      | 2 ++
 ...stc-ap-rustc__target_src_spec_aarch64__be__unknown__netbsd.rs | 5 -----
 6 files changed, 11 insertions(+), 13 deletions(-)

diffs:
diff --git a/rust/Makefile b/rust/Makefile
index d8227ff438..943a31aac4 100644
--- a/rust/Makefile
+++ b/rust/Makefile
@@ -64,10 +64,11 @@ CONFIGURE_ARGS+=	--enable-vendor
 # cargo defaults to using the number of available CPUs
 MAKE_ENV+=		CARGO_BUILD_JOBS=${_MAKE_JOBS_N}
 
-# Ensure we use a bundled lzma rather than relying on finding one, and avoid
-# xz being buildlinked if it's pulled in via dependencies.
-BUILDLINK_FILES_CMD.xz=	${TRUE}
-MAKE_ENV+=		LZMA_API_STATIC=1
+# Rust builds some bundled components with strict version requirements, ensure
+# that any conflicting packages pulled in via dependencies are not buildlinked.
+BUILDLINK_FILES_CMD.libssh2=	${TRUE}
+BUILDLINK_FILES_CMD.xz=		${TRUE}
+MAKE_ENV+=			LZMA_API_STATIC=1
 
 # MacOS X 10.7 is the oldest supported version. See
 # ${WRKSRC}/src/bootstrap/lib.rs
diff --git a/rust/cross.mk b/rust/cross.mk
index 467c0f6dff..2984a3d058 100644
--- a/rust/cross.mk
+++ b/rust/cross.mk
@@ -49,7 +49,7 @@
 #TARGET=		i686-unknown-netbsd
 #TARGET=		i586-unknown-netbsd
 #TARGET=		mipsel-unknown-netbsd
-#TARGET= 		riscv64gc-unknown-netbsd
+#TARGET=		riscv64gc-unknown-netbsd
 #
 #SCRIPTS=		${WRKDIR}/scripts
 #CONFIGURE_ARGS+=	--host=${TARGET}
diff --git a/rust/distinfo b/rust/distinfo
index 412337deb5..2f85c60025 100644
--- a/rust/distinfo
+++ b/rust/distinfo
@@ -164,9 +164,9 @@ SHA1 (patch-vendor_lzma-sys_config.h) = b654c7e129fa02697734bc87173f89b3056a5437
 SHA1 (patch-vendor_nix_src_sys_signal.rs) = bf4fcdc5b71d8d73b3d7e8acfccd0554d822c131
 SHA1 (patch-vendor_openssl-src_openssl_Configurations_10-main.conf) = 1c4e1d5520776e70d588f3da0fd54b6f956835b5
 SHA1 (patch-vendor_openssl-src_src_lib.rs) = 9511c09ed2bf035d3c1e684492bbb8f46d4e58ef
-SHA1 (patch-vendor_openssl-sys_build_find__normal.rs) = 8c4311cdd2bd66882fa8406e28119a0144df5301
+SHA1 (patch-vendor_openssl-sys_build_find__normal.rs) = 7f8ebfdc011f1a8ab0db61ca3d2b7ec00d80a3fc
 SHA1 (patch-vendor_openssl-sys_build_main.rs) = 20618b13b56cc93bb5c051f96046604dd4977345
-SHA1 (patch-vendor_rustc-ap-rustc__target_src_spec_aarch64__be__unknown__netbsd.rs) = fb73bf5c50d2cfaa75bcd2f58e5dff9b634557f5
+SHA1 (patch-vendor_rustc-ap-rustc__target_src_spec_aarch64__be__unknown__netbsd.rs) = 4e86aec4c89db9a331950a12f8ec7b8aaa50eed7
 SHA1 (patch-vendor_stacker_src_lib.rs) = e00a1e95eb16540ff182715db778bf97ebd07a5e
 SHA1 (patch-vendor_target-lexicon_src_targets.rs) = 8562658e5f11ab1cf977d83fc48c4b3c000fbc0e
 SHA1 (patch-vendor_valuable_no__atomic.rs) = 3a40cb846bf1fae864c55a0ddba8fdeb5efcba72
diff --git a/rust/do-cross.mk b/rust/do-cross.mk
index f15da4777f..34a9aef6f1 100644
--- a/rust/do-cross.mk
+++ b/rust/do-cross.mk
@@ -39,7 +39,7 @@ G_TGT.arm64=		aarch64--netbsd
 G_TGT.arm64_be=		aarch64_be--netbsd
 G_TGT.i386=		i486--netbsdelf
 G_TGT.mipsel=		mipsel--netbsd
-G_TGT.riscv64		riscv64--netbsd
+G_TGT.riscv64=		riscv64--netbsd
 
 # Mapping to rust's TARGET specification
 TGT.armv7=		armv7-unknown-netbsd-eabihf
diff --git a/rust/patches/patch-vendor_openssl-sys_build_find__normal.rs b/rust/patches/patch-vendor_openssl-sys_build_find__normal.rs
index 5d651c130d..7f01872a4f 100644
--- a/rust/patches/patch-vendor_openssl-sys_build_find__normal.rs
+++ b/rust/patches/patch-vendor_openssl-sys_build_find__normal.rs
@@ -1,5 +1,7 @@
 $NetBSD: patch-vendor_openssl-sys_build_find__normal.rs,v 1.1 2023/06/19 14:46:47 bsiegert Exp $
 
+Patch against homebrew hack.
+
 --- vendor/openssl-sys/build/find_normal.rs.orig	2023-05-31 21:44:49.000000000 +0000
 +++ vendor/openssl-sys/build/find_normal.rs
 @@ -72,23 +72,6 @@ fn resolve_with_wellknown_location(dir:
diff --git a/rust/patches/patch-vendor_rustc-ap-rustc__target_src_spec_aarch64__be__unknown__netbsd.rs b/rust/patches/patch-vendor_rustc-ap-rustc__target_src_spec_aarch64__be__unknown__netbsd.rs
index 8d8496836f..98a1d9cb7b 100644
--- a/rust/patches/patch-vendor_rustc-ap-rustc__target_src_spec_aarch64__be__unknown__netbsd.rs
+++ b/rust/patches/patch-vendor_rustc-ap-rustc__target_src_spec_aarch64__be__unknown__netbsd.rs
@@ -1,8 +1,3 @@
-diff -git a/rust/patches/patch-vendor_rustc-ap-rustc__target_src_spec_aarch64__be__unknown__netbsd.rs b/rust/patches/patch-vendor_rustc-ap-rustc__target_src_spec_aarch64__be__unknown__netbsd.rs
-index 98a1d9cb7b..e69de29bb2 100644
--- a/rust/patches/patch-vendor_rustc-ap-rustc__target_src_spec_aarch64__be__unknown__netbsd.rs
-+++ b/rust/patches/patchvendor_rustc-ap-rustc__target_src_spec_aarch64__be__unknown__netbsd.rs
-@@ 1,27 +0,0 @@
 $NetBSD$
 
 Add aarch64_be NetBSD target.