CVS commit: pkgsrc/mk/build

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Sun Jan 19 16:51:47 UTC 2020

Modified Files:
        pkgsrc/mk/build: build.mk

Log Message:
Add a visible EFFECTIVE_MAKE_JOBS, a tunable resembling _MAKE_JOBS,
but is defined as 1 in the case of no jobs.

No -j prefix for maximum usability.
(XXX: is _DEF_VARS the right place to add it?)


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 pkgsrc/mk/build/build.mk

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

Modified files:

Index: pkgsrc/mk/build/build.mk
diff -u pkgsrc/mk/build/build.mk:1.28 pkgsrc/mk/build/build.mk:1.29
--- pkgsrc/mk/build/build.mk:1.28       Mon Sep  2 02:59:47 2019
+++ pkgsrc/mk/build/build.mk    Sun Jan 19 16:51:47 2020
@@ -1,4 +1,4 @@
-# $NetBSD: build.mk,v 1.28 2019/09/02 02:59:47 rillig Exp $
+# $NetBSD: build.mk,v 1.29 2020/01/19 16:51:47 maya Exp $
 #
 # This file defines what happens in the build phase, excluding the
 # self-test, which is defined in test.mk.
@@ -38,6 +38,7 @@
 # Keywords: build make
 
 _VARGROUPS+=           build
+_DEF_VARS.build=       EFFECTIVE_MAKE_JOBS
 _USER_VARS.build=      MAKE_JOBS BUILD_ENV_SHELL
 _PKG_VARS.build=       MAKE_ENV MAKE_FLAGS BUILD_MAKE_FLAGS BUILD_TARGET MAKE_JOBS_SAFE
 _SYS_VARS.build=       BUILD_MAKE_CMD
@@ -54,11 +55,14 @@ BUILD_MAKE_CMD= \
                        -f ${MAKE_FILE}
 
 .if defined(MAKE_JOBS_SAFE) && !empty(MAKE_JOBS_SAFE:M[nN][oO])
-_MAKE_JOBS=    # nothing
+_MAKE_JOBS=            # nothing
+EFFECTIVE_MAKE_JOBS=   1
 .elif defined(MAKE_JOBS.${PKGPATH})
-_MAKE_JOBS=    -j${MAKE_JOBS.${PKGPATH}}
+_MAKE_JOBS=            -j${MAKE_JOBS.${PKGPATH}}
+EFFECTIVE_MAKE_JOBS=   ${MAKE_JOBS.${PKGPATH}}
 .elif defined(MAKE_JOBS)
-_MAKE_JOBS=    -j${MAKE_JOBS}
+_MAKE_JOBS=            -j${MAKE_JOBS}
+EFFECTIVE_MAKE_JOBS=   ${MAKE_JOBS}
 .endif
 
 ######################################################################