CVS commit: pkgsrc/lang/rust

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Mon Jul  3 20:38:21 UTC 2023

Modified Files:
        pkgsrc/lang/rust: Makefile

Log Message:
rust: Ensure libssh2 is not buildlinked.


To generate a diff of this commit:
cvs rdiff -u -r1.285 -r1.286 pkgsrc/lang/rust/Makefile

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

Modified files:

Index: pkgsrc/lang/rust/Makefile
diff -u pkgsrc/lang/rust/Makefile:1.285 pkgsrc/lang/rust/Makefile:1.286
--- pkgsrc/lang/rust/Makefile:1.285     Fri Jun 30 12:38:40 2023
+++ pkgsrc/lang/rust/Makefile   Mon Jul  3 20:38:20 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.285 2023/06/30 12:38:40 mef Exp $
+# $NetBSD: Makefile,v 1.286 2023/07/03 20:38:20 jperkin Exp $
 
 DISTNAME=      rustc-1.69.0-src
 PKGNAME=       ${DISTNAME:S/rustc/rust/:S/-src//}
@@ -64,9 +64,12 @@ 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}
+# 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}
+
+# Use the bundled lzma.
 MAKE_ENV+=             LZMA_API_STATIC=1
 
 # MacOS X 10.7 is the oldest supported version. See