Merge bmake-20230909

Merge commit '1012cf15f75d1e9048779abd07270a37cdba590a'

Author: sgerraty

contrib/bmake/ChangeLog

@@ -1,3 +1,81 @@
+2023-09-09  Simon J Gerraty  <[email protected]>
+
+	* VERSION (_MAKE_VERSION): 20230909
+	Merge with NetBSD make, pick up
+	o main.c: allow -j to compute a multiple of ncpu
+	If _SC_NPROCESSORS_ONLN is supported; and -j arg is a floating
+	point number or ends in 'C' compute .MAKE.JOBS as a multiple of
+	_SC_NPROCESSORS_ONLN
+	.MAKE.JOBS.C will be "yes" if -jC is supported
+
+2023-08-20  Simon J Gerraty  <[email protected]>
+
+	* VERSION (_MAKE_VERSION): 20230820
+	Merge with NetBSD make, pick up
+	o make.1: note that :localtime is better for %s
+	o parse.c: improve error messages for invalid input.
+	o var.c: fix for %s:L:gmtime - set TZ=UTC and use localtime to get
+	correct result, it is still better to use %s:L:localtime.
+
+2023-08-18  Simon J Gerraty  <[email protected]>
+
+	* VERSION (_MAKE_VERSION): 20230818
+	Merge with NetBSD make, pick up
+	o meta.c: meta_ignore - check raw path against metaIgnorePaths
+	to potentially skip call to realpath.
+	o var.c: be strict when parsing the argument of the ':mtime' modifier
+	o unit-tests/varmod-mtime.mk: document why '${%s:L:localtime}'
+	should be used to get an equivalent value to time(3).
+
+2023-08-16  Simon J Gerraty  <[email protected]>
+
+	* VERSION (_MAKE_VERSION): 20230816
+	Merge with NetBSD make, pick up
+	o cond.c: clean up multiple-inclusion guards
+
+2023-07-25  Simon J Gerraty  <[email protected]>
+
+	* unit-tests/Makefile: addd varmod-localtime to BROKEN_TESTS
+	if configure cannot work out how to control TZ.
+	Remove varmod-localtime from BROKEN_TESTS for IRIX*
+
+2023-07-24  Simon J Gerraty  <[email protected]>
+
+	* VERSION (_MAKE_VERSION): 20230723
+
+	* configure.in: fix the test for wether TZ=Europe/Berlin works.
+	Depending on the time of year, if run between 22:00 and 00:00 UTC
+	the check in configure would fail incorrectly.
+	Take the day into account as well.
+
+2023-07-18  Simon J Gerraty  <[email protected]>
+
+	* VERSION (_MAKE_VERSION): 20230711
+	Merge with NetBSD make, pick up
+	o make.1: clean up wording, clarify scope of '!' in conditions
+
+2023-07-15  Simon J Gerraty  <[email protected]>
+
+	* make-bootstrap.sh.in: set prefix
+	If configure is run using ksh we get unexpanded ${prefix} in
+	DEFAULT_SYS_PATH, by ensuring prefix is set we should still get
+	correct result.
+
+2023-07-13  Simon J Gerraty  <[email protected]>
+
+	* VERSION (_MAKE_VERSION): 20230711
+	bump version for IRIX tweaks
+
+	* make.h: undef OP_NONE if defined
+
+	* unit-tests/Makefile: set BROKEN_TESTS for IRIX
+
+	* configure.in: override INSTALL on IRIX
+
+2023-06-27  Simon J Gerraty  <[email protected]>
+
+	* boot-strap op_test: ensure we set TEST_MAKE as we want it.
+
 2023-06-22  Simon J Gerraty  <[email protected]>
 
 	* VERSION (_MAKE_VERSION): 20230622

contrib/bmake/VERSION

@@ -1,2 +1,2 @@
 # keep this compatible with sh and make
-_MAKE_VERSION=20230622
+_MAKE_VERSION=20230909

contrib/bmake/bmake.1

@@ -1,4 +1,4 @@
-.\"	$NetBSD: make.1,v 1.366 2023/05/10 18:22:33 sjg Exp $
+.\"	$NetBSD: make.1,v 1.371 2023/09/10 21:52:36 rillig Exp $
 .\"
 .\" Copyright (c) 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"	from: @(#)make.1	8.4 (Berkeley) 3/19/94
 .\"
-.Dd May 10, 2023
+.Dd September 9, 2023
 .Dt BMAKE 1
 .Os
 .Sh NAME
@@ -267,6 +267,12 @@ cooperate to avoid overloading the system.
 Specify the maximum number of jobs that
 .Nm
 may have running at any one time.
+If
+.Ar max_jobs
+is a floating point number, or ends with
+.Ql C ,
+then the value is multiplied by the number of CPUs reported online by
+.Xr sysconf 3 .
 The value of
 .Ar max_jobs
 is saved in
@@ -971,6 +977,11 @@ making it easier to track the degree of parallelism being achieved.
 The argument to the
 .Fl j
 option.
+.It Va .MAKE.JOBS.C
+A read-only boolean that indicates whether the
+.Fl j
+option supports use of
+.Ql C .
 .It Va .MAKE.LEVEL
 The recursion depth of
 .Nm .
@@ -1497,6 +1508,10 @@ The value is interpreted as a format string for
 using
 .Xr gmtime 3 ,
 producing the formatted timestamp.
+Note: the
+.Ql %s
+format should only be used with
+.Sq Cm \&:localtime .
 If a
 .Ar timestamp
 value is not provided or is 0, the current time is used.
@@ -2069,7 +2084,7 @@ only evaluates a conditional as far as is necessary to determine its value.
 Parentheses can be used to override the operator precedence.
 The boolean operator
 .Sq Ic \&!
-may be used to logically negate an entire conditional.
+may be used to logically negate an expression, typically a function call.
 It is of higher precedence than
 .Sq Ic \&&& .
 .Pp
@@ -2119,9 +2134,9 @@ may also be an arithmetic or string comparison.
 Variable expansion is performed on both sides of the comparison.
 If both sides are numeric and neither is enclosed in quotes,
 the comparison is done numerically, otherwise lexicographically.
-A string is interpreted as hexadecimal integer if it is preceded by
+A string is interpreted as a hexadecimal integer if it is preceded by
 .Li 0x ,
-otherwise it is a decimal floating-point number;
+otherwise it is interpreted as a decimal floating-point number;
 octal numbers are not supported.
 .Pp
 All comparisons may use the operators
@@ -2142,7 +2157,7 @@ and its numeric value (if any) is not zero.
 When
 .Nm
 is evaluating one of these conditional expressions, and it encounters
-a (whitespace separated) word it doesn't recognize, either the
+a (whitespace-separated) word it doesn't recognize, either the
 .Dq make
 or
 .Dq defined
@@ -2165,12 +2180,13 @@ function is applied.
 .Pp
 If the conditional evaluates to true,
 parsing of the makefile continues as before.
-If it evaluates to false, the following lines are skipped.
-In both cases, this continues until the corresponding
+If it evaluates to false, the following lines until the corresponding
+.Sq Ic .elif
+variant,
 .Sq Ic .else
 or
 .Sq Ic .endif
-is found.
+are skipped.
 .Ss For loops
 For loops are typically used to apply a set of rules to a list of files.
 The syntax of a for loop is:

contrib/bmake/bmake.cat1

@@ -157,15 +157,17 @@ BMAKE(1)                FreeBSD General Commands Manual               BMAKE(1)
 
      -j max_jobs
              Specify the maximum number of jobs that bmake may have running at
-             any one time.  The value of max_jobs is saved in .MAKE.JOBS.
-             Turns compatibility mode off, unless the -B option is also speci-
-             fied.  When compatibility mode is off, all commands associated
-             with a target are executed in a single shell invocation as op-
-             posed to the traditional one shell invocation per line.  This can
-             break traditional scripts which change directories on each com-
-             mand invocation and then expect to start with a fresh environment
-             on the next line.  It is more efficient to correct the scripts
-             rather than turn backwards compatibility on.
+             any one time.  If max_jobs is a floating point number, or ends
+             with `C', then the value is multiplied by the number of CPUs re-
+             ported online by sysconf(3).  The value of max_jobs is saved in
+             .MAKE.JOBS.  Turns compatibility mode off, unless the -B option
+             is also specified.  When compatibility mode is off, all commands
+             associated with a target are executed in a single shell invoca-
+             tion as opposed to the traditional one shell invocation per line.
+             This can break traditional scripts which change directories on
+             each command invocation and then expect to start with a fresh en-
+             vironment on the next line.  It is more efficient to correct the
+             scripts rather than turn backwards compatibility on.
 
              A job token pool with max_jobs tokens is used to control the to-
              tal number of jobs running.  Each instance of bmake will wait for
@@ -625,6 +627,10 @@ BMAKE(1)                FreeBSD General Commands Manual               BMAKE(1)
      .MAKE.JOBS
              The argument to the -j option.
 
+     .MAKE.JOBS.C
+             A read-only boolean that indicates whether the -j option supports
+             use of `C'.
+
      .MAKE.LEVEL
              The recursion depth of bmake.  The top-level instance of bmake
              has level 0, and each child make has its parent level plus 1.
@@ -972,8 +978,9 @@ BMAKE(1)                FreeBSD General Commands Manual               BMAKE(1)
 
      :gmtime[=timestamp]
           The value is interpreted as a format string for strftime(3), using
-          gmtime(3), producing the formatted timestamp.  If a timestamp value
-          is not provided or is 0, the current time is used.
+          gmtime(3), producing the formatted timestamp.  Note: the `%s' format
+          should only be used with `:localtime'.  If a timestamp value is not
+          provided or is 0, the current time is used.
 
      :hash
           Computes a 32-bit hash of the value and encodes it as 8 hex digits.
@@ -1313,8 +1320,8 @@ BMAKE(1)                FreeBSD General Commands Manual               BMAKE(1)
 
      bmake only evaluates a conditional as far as is necessary to determine
      its value.  Parentheses can be used to override the operator precedence.
-     The boolean operator `!' may be used to logically negate an entire condi-
-     tional.  It is of higher precedence than `&&'.
+     The boolean operator `!' may be used to logically negate an expression,
+     typically a function call.  It is of higher precedence than `&&'.
 
      The value of expression may be any of the following function call expres-
      sions:
@@ -1346,9 +1353,9 @@ BMAKE(1)                FreeBSD General Commands Manual               BMAKE(1)
      Expression may also be an arithmetic or string comparison.  Variable ex-
      pansion is performed on both sides of the comparison.  If both sides are
      numeric and neither is enclosed in quotes, the comparison is done numeri-
-     cally, otherwise lexicographically.  A string is interpreted as hexadeci-
-     mal integer if it is preceded by 0x, otherwise it is a decimal floating-
-     point number; octal numbers are not supported.
+     cally, otherwise lexicographically.  A string is interpreted as a hexa-
+     decimal integer if it is preceded by 0x, otherwise it is interpreted as a
+     decimal floating-point number; octal numbers are not supported.
 
      All comparisons may use the operators `==' and `!='.  Numeric comparisons
      may also use the operators `<', `<=', `>' and `>='.
@@ -1358,16 +1365,15 @@ BMAKE(1)                FreeBSD General Commands Manual               BMAKE(1)
      any) is not zero.
 
      When bmake is evaluating one of these conditional expressions, and it en-
-     counters a (whitespace separated) word it doesn't recognize, either the
+     counters a (whitespace-separated) word it doesn't recognize, either the
      "make" or "defined" function is applied to it, depending on the form of
      the conditional.  If the form is `.ifdef', `.ifndef' or `.if', the
      "defined" function is applied.  Similarly, if the form is `.ifmake' or
      `.ifnmake', the "make" function is applied.
 
      If the conditional evaluates to true, parsing of the makefile continues
-     as before.  If it evaluates to false, the following lines are skipped.
-     In both cases, this continues until the corresponding `.else' or `.endif'
-     is found.
+     as before.  If it evaluates to false, the following lines until the cor-
+     responding `.elif' variant, `.else' or `.endif' are skipped.
 
    For loops
      For loops are typically used to apply a set of rules to a list of files.
@@ -1753,4 +1759,4 @@ BMAKE(1)                FreeBSD General Commands Manual               BMAKE(1)
      attempt to suppress a cascade of unnecessary errors, can result in a
      seemingly unexplained `*** Error code 6'
 
-FreeBSD 13.0                     May 10, 2023                     FreeBSD 13.0
+FreeBSD 13.0                   September 9, 2023                  FreeBSD 13.0

contrib/bmake/boot-strap

@@ -119,7 +119,7 @@
 #	Simon J. Gerraty <[email protected]>
 
 # RCSid:
-#	$Id: boot-strap,v 1.57 2021/10/22 20:32:21 sjg Exp $
+#	$Id: boot-strap,v 1.58 2023/06/27 21:02:19 sjg Exp $
 #
 #	@(#) Copyright (c) 2001 Simon J. Gerraty
 #
@@ -420,7 +420,7 @@ op_build() {
 
 op_test() {
 	[ -x bmake ] || op_build
-	Bmake test "$@" TEST_MAKE=$objdir/bmake || exit 1
+	Bmake test TEST_MAKE=$objdir/bmake "$@" || exit 1
 }
 
 op_clean() {

contrib/bmake/cond.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: cond.c,v 1.353 2023/06/23 05:21:10 rillig Exp $	*/
+/*	$NetBSD: cond.c,v 1.354 2023/08/11 04:56:31 rillig Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -92,7 +92,7 @@
 #include "dir.h"
 
 /*	"@(#)cond.c	8.2 (Berkeley) 1/2/94"	*/
-MAKE_RCSID("$NetBSD: cond.c,v 1.353 2023/06/23 05:21:10 rillig Exp $");
+MAKE_RCSID("$NetBSD: cond.c,v 1.354 2023/08/11 04:56:31 rillig Exp $");
 
 /*
  * Conditional expressions conform to this grammar:
@@ -224,17 +224,13 @@ ParseWord(const char **pp, bool doEval)
 		if ((ch == '&' || ch == '|') && paren_depth == 0)
 			break;
 		if (ch == '$') {
-			/*
-			 * Parse the variable expression and install it as
-			 * part of the argument if it's valid. We tell
-			 * Var_Parse to complain on an undefined variable,
-			 * (XXX: but Var_Parse ignores that request)
-			 * so we don't need to do it. Nor do we return an
-			 * error, though perhaps we should.
-			 */
 			VarEvalMode emode = doEval
 			    ? VARE_UNDEFERR
 			    : VARE_PARSE_ONLY;
+			/*
+			 * TODO: make Var_Parse complain about undefined
+			 * variables.
+			 */
 			FStr nestedVal = Var_Parse(&p, SCOPE_CMDLINE, emode);
 			/* TODO: handle errors */
 			Buf_AddStr(&word, nestedVal.str);
@@ -1267,7 +1263,6 @@ Cond_ExtractGuard(const char *line)
 {
 	const char *p, *varname;
 	Substring dir;
-	enum GuardKind kind;
 	Guard *guard;
 
 	p = line + 1;		/* skip the '.' */
@@ -1288,10 +1283,9 @@ Cond_ExtractGuard(const char *line)
 			const char *arg_p = p;
 			free(ParseWord(&p, false));
 			if (strcmp(p, ")") == 0) {
-				char *target = ParseWord(&arg_p, true);
 				guard = bmake_malloc(sizeof(*guard));
 				guard->kind = GK_TARGET;
-				guard->name = target;
+				guard->name = ParseWord(&arg_p, true);
 				return guard;
 			}
 		}
@@ -1302,9 +1296,8 @@ Cond_ExtractGuard(const char *line)
 	return NULL;
 
 found_variable:
-	kind = GK_VARIABLE;
 	guard = bmake_malloc(sizeof(*guard));
-	guard->kind = kind;
+	guard->kind = GK_VARIABLE;
 	guard->name = bmake_strsedup(varname, p);
 	return guard;
 }