CVS commit: pkgsrc/lang/rust

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Wed Mar 31 16:45:08 UTC 2021

Modified Files:
        pkgsrc/lang/rust: Makefile options.mk

Log Message:
rust: Only enable rust-cargo-static when building bootstraps.

The final compiler will be dynamically linked with OpenSSL and curl,
but this is undesirable in the case of bootstraps where it might be
built against a version incompatible with version the user has.

Discussed with he@.


To generate a diff of this commit:
cvs rdiff -u -r1.221 -r1.222 pkgsrc/lang/rust/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/lang/rust/options.mk

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.221 pkgsrc/lang/rust/Makefile:1.222
--- pkgsrc/lang/rust/Makefile:1.221     Tue Mar 30 09:50:14 2021
+++ pkgsrc/lang/rust/Makefile   Wed Mar 31 16:45:08 2021
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.221 2021/03/30 09:50:14 nia Exp $
+# $NetBSD: Makefile,v 1.222 2021/03/31 16:45:08 nia Exp $
 
 DISTNAME=      rustc-1.49.0-src
 PKGNAME=       ${DISTNAME:S/rustc/rust/:S/-src//}
+PKGREVISION=   1
 CATEGORIES=    lang
 MASTER_SITES=  https://static.rust-lang.org/dist/
 

Index: pkgsrc/lang/rust/options.mk
diff -u pkgsrc/lang/rust/options.mk:1.12 pkgsrc/lang/rust/options.mk:1.13
--- pkgsrc/lang/rust/options.mk:1.12    Tue Mar 30 09:50:14 2021
+++ pkgsrc/lang/rust/options.mk Wed Mar 31 16:45:08 2021
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.12 2021/03/30 09:50:14 nia Exp $
+# $NetBSD: options.mk,v 1.13 2021/03/31 16:45:08 nia Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.rust
 PKG_SUPPORTED_OPTIONS+=        rust-cargo-static
@@ -14,7 +14,11 @@ PKG_SUGGESTED_OPTIONS+=              rust-llvm
 .  endif
 .endif
 
-.if ${OPSYS} == "NetBSD"
+.include "cross.mk"
+
+# Bundle OpenSSL and curl into the cargo binary when producing
+# bootstraps.
+.if ${OPSYS} == "NetBSD" && !empty(TARGET)
 PKG_SUGGESTED_OPTIONS+=        rust-cargo-static
 .endif