CVS commit: pkgsrc/lang/rust

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

Module Name:    pkgsrc
Committed By:   he
Date:           Tue Apr 20 11:54:32 UTC 2021

Modified Files:
        pkgsrc/lang/rust: Makefile buildlink3.mk cross.mk

Log Message:
Fix errors and most warnings flagged by pkglint.
Note to self: run pkglint before committing.
Thanks to jperkin@ for the note.


To generate a diff of this commit:
cvs rdiff -u -r1.230 -r1.231 pkgsrc/lang/rust/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/lang/rust/buildlink3.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/rust/cross.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.230 pkgsrc/lang/rust/Makefile:1.231
--- pkgsrc/lang/rust/Makefile:1.230     Mon Apr 19 17:08:09 2021
+++ pkgsrc/lang/rust/Makefile   Tue Apr 20 11:54:32 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.230 2021/04/19 17:08:09 he Exp $
+# $NetBSD: Makefile,v 1.231 2021/04/20 11:54:32 he Exp $
 
 DISTNAME=      rustc-1.50.0-src
 PKGNAME=       ${DISTNAME:S/rustc/rust/:S/-src//}
@@ -49,7 +49,7 @@ CONFIGURE_ARGS+=              --disable-ninja
 .include "cross.mk"
 
 .if !empty(rust.BUILD_TARGET)
-BUILD_TARGET=  ${rust.BUILD_TARGET)
+BUILD_TARGET=  ${rust.BUILD_TARGET}
 .endif
 
 .if !empty(TARGET)

Index: pkgsrc/lang/rust/buildlink3.mk
diff -u pkgsrc/lang/rust/buildlink3.mk:1.8 pkgsrc/lang/rust/buildlink3.mk:1.9
--- pkgsrc/lang/rust/buildlink3.mk:1.8  Mon Apr 19 17:08:09 2021
+++ pkgsrc/lang/rust/buildlink3.mk      Tue Apr 20 11:54:32 2021
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.8 2021/04/19 17:08:09 he Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2021/04/20 11:54:32 he Exp $
+
+BUILDLINK_TREE+=       rust
 
 #
 # DO NOT include this directly! Use rust.mk instead.
 #
 
-BUILDLINK_TREE+=       rust
-
 .if !defined(RUST_BUILDLINK3_MK)
 RUST_BUILDLINK3_MK:=
 

Index: pkgsrc/lang/rust/cross.mk
diff -u pkgsrc/lang/rust/cross.mk:1.4 pkgsrc/lang/rust/cross.mk:1.5
--- pkgsrc/lang/rust/cross.mk:1.4       Mon Apr 19 17:08:09 2021
+++ pkgsrc/lang/rust/cross.mk   Tue Apr 20 11:54:32 2021
@@ -1,4 +1,4 @@
-# $NetBSD: cross.mk,v 1.4 2021/04/19 17:08:09 he Exp $
+# $NetBSD: cross.mk,v 1.5 2021/04/20 11:54:32 he Exp $
 
 # These settings may be used to cross-build rust.
 #
@@ -38,7 +38,7 @@
 #TARGET=               powerpc-unknown-netbsd
 #TARGET=               aarch64-unknown-netbsd
 #TARGET=               i686-unknown-netbsd
-#TARGET=               i586-unknown-netbsd
+#TARGET=               i586-unknown-netbsd
 #
 #SCRIPTS=              ${WRKDIR}/scripts
 #CONFIGURE_ARGS+=      --host=${TARGET}
@@ -57,15 +57,15 @@
 # Cross-compile illumos target.  The host is identical, it's just the target
 # that is renamed from x86_64-sun-solaris to x86_64-unknown-illumos.
 #
-#TARGET=               x86_64-unknown-illumos
+#TARGET=               x86_64-unknown-illumos
 #
 # Use these variables for "cross-compiling" from x86_64-sun-solaris.
 #
-#CONFIGURE_ARGS+=      --set=target.${TARGET}.llvm-config=${LLVM_CONFIG_PATH}
-#CONFIGURE_ARGS+=      --host=${TARGET}
-#CONFIGURE_ARGS+=      --target=${TARGET}
+#CONFIGURE_ARGS+=      --set=target.${TARGET}.llvm-config=${LLVM_CONFIG_PATH}
+#CONFIGURE_ARGS+=      --host=${TARGET}
+#CONFIGURE_ARGS+=      --target=${TARGET}
 #
 # Set this variable when using a native x86_64-unknown-illumos bootstrap, as
 # the build still defaults to x86_64-sun-solaris based on uname.
 #
-#CONFIGURE_ARGS+=      --build=${TARGET}
+#CONFIGURE_ARGS+=      --build=${TARGET}