CVS commit: pkgsrc/lang/rust

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Sun Jun 14 11:19:35 UTC 2020

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

Log Message:
lang/rust: fix unsatisfiable condition in cargo.mk

The condition had been the same as in Makefile before 1.174.

Testing for OPSYS was unnecessary since that is included in
MACHINE_PLATFORM as well.

The ${VAR} syntax is easier readable since the number of exclamation
marks matches the number of negations, contrary to !empty, which is
effectively a positive test.

Swapped the order of the conditions since it is easier to read
"generally, but not" than "not this and the general case".


To generate a diff of this commit:
cvs rdiff -u -r1.177 -r1.178 pkgsrc/lang/rust/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/lang/rust/cargo.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.177 pkgsrc/lang/rust/Makefile:1.178
--- pkgsrc/lang/rust/Makefile:1.177     Sat Jun 13 14:26:00 2020
+++ pkgsrc/lang/rust/Makefile   Sun Jun 14 11:19:34 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.177 2020/06/13 14:26:00 gdt Exp $
+# $NetBSD: Makefile,v 1.178 2020/06/14 11:19:34 rillig Exp $
 
 DISTNAME=      rustc-1.43.1-src
 PKGNAME=       ${DISTNAME:S/rustc/rust/:S/-src//}
@@ -158,9 +158,9 @@ CONFIGURE_ARGS+=    --set llvm.targets="ARM
 #
 # If we aren't on 9-current, and are on 8.x or 9.x, avoid parallel.
 # \todo Consider avoiding setting this on netbsd-9 past the fix.
-.if empty(MACHINE_PLATFORM:MNetBSD-9.99.*) && !empty(MACHINE_PLATFORM:MNetBSD-[1-9].*)
+.  if ${MACHINE_PLATFORM:MNetBSD-[1-9].*} && !${MACHINE_PLATFORM:MNetBSD-9.99.*}
 MAKE_JOBS_SAFE=        no
-.endif
+.  endif
 .endif
 
 #

Index: pkgsrc/lang/rust/cargo.mk
diff -u pkgsrc/lang/rust/cargo.mk:1.15 pkgsrc/lang/rust/cargo.mk:1.16
--- pkgsrc/lang/rust/cargo.mk:1.15      Mon Jun  8 22:37:28 2020
+++ pkgsrc/lang/rust/cargo.mk   Sun Jun 14 11:19:34 2020
@@ -1,4 +1,4 @@
-# $NetBSD: cargo.mk,v 1.15 2020/06/08 22:37:28 he Exp $
+# $NetBSD: cargo.mk,v 1.16 2020/06/14 11:19:34 rillig Exp $
 #
 # Common logic that can be used by packages that depend on cargo crates
 # from crates.io. This lets existing pkgsrc infrastructure fetch and verify
@@ -42,8 +42,8 @@ EXTRACT_DIR.${_crate}.crate?= ${CARGO_VE
 
 .include "../../mk/bsd.prefs.mk"
 # Triggers NetBSD ld.so bug (PR toolchain/54192)
-.if ${OPSYS} == "NetBSD" && !empty(MACHINE_PLATFORM:MNetBSD-9.99.*) && \
-    !empty(MACHINE_PLATFORM:MNetBSD-[1-9][0-9].*)
+# See Makefile for further information.
+.if ${MACHINE_PLATFORM:MNetBSD-[1-9].*} && !${MACHINE_PLATFORM:MNetBSD-9.99.*}
 MAKE_JOBS_SAFE=        no
 .endif