Author: sjg
Date: Fri Jul 28 15:43:36 2017
New Revision: 321653
URL: https://svnweb.freebsd.org/changeset/base/321653
Log:
MFC bmake-20170720
PR: 221023
Modified:
stable/11/contrib/bmake/ChangeLog
stable/11/contrib/bmake/Makefile
stable/11/contrib/bmake/bmake.1
stable/11/contrib/bmake/bmake.cat1
stable/11/contrib/bmake/buf.h
stable/11/contrib/bmake/compat.c
stable/11/contrib/bmake/dir.h
stable/11/contrib/bmake/hash.h
stable/11/contrib/bmake/job.c
stable/11/contrib/bmake/main.c
stable/11/contrib/bmake/make.1
stable/11/contrib/bmake/make.h
stable/11/contrib/bmake/meta.c
stable/11/contrib/bmake/mk/ChangeLog
stable/11/contrib/bmake/mk/dirdeps.mk
stable/11/contrib/bmake/mk/install-mk
stable/11/contrib/bmake/mk/lib.mk
stable/11/contrib/bmake/mk/meta.stage.mk
stable/11/contrib/bmake/mk/meta.sys.mk
stable/11/contrib/bmake/mk/meta2deps.py
stable/11/contrib/bmake/mk/own.mk
stable/11/contrib/bmake/nonints.h
stable/11/contrib/bmake/sprite.h
stable/11/usr.bin/bmake/Makefile
stable/11/usr.bin/bmake/Makefile.inc
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/contrib/bmake/ChangeLog
==============================================================================
--- stable/11/contrib/bmake/ChangeLog Fri Jul 28 12:22:32 2017
(r321652)
+++ stable/11/contrib/bmake/ChangeLog Fri Jul 28 15:43:36 2017
(r321653)
@@ -1,3 +1,23 @@
+2017-07-20 Simon J. Gerraty <s...@bad.crufty.net>
+
+ * Makefile (_MAKE_VERSION): 20170720
+ Merge with NetBSD make, pick up
+ o compat.c: pass SIGINT etc onto child and wait for it to exit
+ before we self-terminate.
+
+2017-07-11 Simon J. Gerraty <s...@bad.crufty.net>
+
+ * Makefile (_MAKE_VERSION): 20170711
+ forgot to update after merge on 20170708 ;-)
+ o main.c: refactor to reduce size of main function.
+ add -v option to always fully expand values.
+ o meta.c: ensure command output in meta file has ending newline
+ even when filemon not being used.
+ When matching ${.MAKE.META.IGNORE_PATTERNS} do not use
+ pathname via ':L' since any ':' in pathname breaks that.
+ Instead set a '${.p.}' to pathname in the target context and
+ use that.
+
2017-05-10 Simon J. Gerraty <s...@bad.crufty.net>
* Makefile (_MAKE_VERSION): 20170510
Modified: stable/11/contrib/bmake/Makefile
==============================================================================
--- stable/11/contrib/bmake/Makefile Fri Jul 28 12:22:32 2017
(r321652)
+++ stable/11/contrib/bmake/Makefile Fri Jul 28 15:43:36 2017
(r321653)
@@ -1,7 +1,7 @@
-# $Id: Makefile,v 1.92 2017/05/10 22:29:04 sjg Exp $
+# $Id: Makefile,v 1.95 2017/07/20 19:36:13 sjg Exp $
# Base version on src date
-_MAKE_VERSION= 20170510
+_MAKE_VERSION= 20170720
PROG= bmake
Modified: stable/11/contrib/bmake/bmake.1
==============================================================================
--- stable/11/contrib/bmake/bmake.1 Fri Jul 28 12:22:32 2017
(r321652)
+++ stable/11/contrib/bmake/bmake.1 Fri Jul 28 15:43:36 2017
(r321653)
@@ -1,4 +1,4 @@
-.\" $NetBSD: make.1,v 1.266 2017/02/01 18:39:27 sjg Exp $
+.\" $NetBSD: make.1,v 1.271 2017/07/03 21:34:20 wiz 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 February 1, 2017
+.Dd June 22, 2017
.Dt BMAKE 1
.Os
.Sh NAME
@@ -48,6 +48,7 @@
.Op Fl m Ar directory
.Op Fl T Ar file
.Op Fl V Ar variable
+.Op Fl v Ar variable
.Op Ar variable=value
.Op Ar target ...
.Sh DESCRIPTION
@@ -206,7 +207,9 @@ Print debugging information about target list maintena
.It Ar V
Force the
.Fl V
-option to print raw values of variables.
+option to print raw values of variables, overriding the default behavior
+set via
+.Va .MAKE.EXPAND_VARIABLES .
.It Ar v
Print debugging information about variable assignment.
.It Ar x
@@ -334,20 +337,39 @@ for each job started and completed.
Rather than re-building a target as specified in the makefile, create it
or update its modification time to make it appear up-to-date.
.It Fl V Ar variable
-Print
-.Nm Ns 's
-idea of the value of
-.Ar variable ,
-in the global context.
+Print the value of
+.Ar variable .
Do not build any targets.
Multiple instances of this option may be specified;
the variables will be printed one per line,
with a blank line for each null or undefined variable.
+The value printed is extracted from the global context after all
+makefiles have been read.
+By default, the raw variable contents (which may
+include additional unexpanded variable references) are shown.
If
.Ar variable
contains a
.Ql \&$
-then the value will be expanded before printing.
+then the value will be recursively expanded to its complete resultant
+text before printing.
+The expanded value will also be printed if
+.Va .MAKE.EXPAND_VARIABLES
+is set to true and
+the
+.Fl dV
+option has not been used to override it.
+Note that loop-local and target-local variables, as well as values
+taken temporarily by global variables during makefile processing, are
+not accessible via this option.
+The
+.Fl dv
+debug mode can be used to see these at the cost of generating
+substantial extraneous output.
+.It Fl v Ar variable
+Like
+.Fl V
+but the variable is always expanded to its complete value.
.It Fl W
Treat any warnings during makefile parsing as errors.
.It Fl w
@@ -657,7 +679,7 @@ The seven local variables are as follows:
.Bl -tag -width ".ARCHIVE" -offset indent
.It Va .ALLSRC
The list of all sources for this target; also known as
-.Ql Va \&\*[Gt] .
+.Ql Va \&> .
.It Va .ARCHIVE
The name of the archive file; also known as
.Ql Va \&! .
@@ -666,7 +688,7 @@ In suffix-transformation rules, the name/path of the s
target is to be transformed (the
.Dq implied
source); also known as
-.Ql Va \&\*[Lt] .
+.Ql Va \&< .
It is not defined in explicit rules.
.It Va .MEMBER
The name of the archive member; also known as
@@ -691,9 +713,9 @@ in archive member rules.
.El
.Pp
The shorter forms
-.Ql ( Va \*[Gt] ,
+.Ql ( Va > ,
.Ql Va \&! ,
-.Ql Va \*[Lt] ,
+.Ql Va < ,
.Ql Va % ,
.Ql Va \&? ,
.Ql Va * ,
@@ -776,6 +798,10 @@ from which generated dependencies are read.
A boolean that controls the default behavior of the
.Fl V
option.
+If true, variable values printed with
+.Fl V
+are fully expanded; if false, the raw variable contents (which may
+include additional unexpanded variable references) are shown.
.It Va .MAKE.EXPORTED
The list of variables exported by
.Nm .
@@ -1287,7 +1313,7 @@ it is anchored at the end of each word.
Inside
.Ar new_string ,
an ampersand
-.Pq Ql \*[Am]
+.Pq Ql &
is replaced by
.Ar old_string
(without any
@@ -1751,7 +1777,7 @@ may be any one of the following:
.Bl -tag -width "Cm XX"
.It Cm \&|\&|
Logical OR.
-.It Cm \&\*[Am]\*[Am]
+.It Cm \&&&
Logical
.Tn AND ;
of higher precedence than
@@ -1768,7 +1794,7 @@ The boolean operator
may be used to logically negate an entire
conditional.
It is of higher precedence than
-.Ql Ic \&\*[Am]\*[Am] .
+.Ql Ic \&&& .
.Pp
The value of
.Ar expression
Modified: stable/11/contrib/bmake/bmake.cat1
==============================================================================
--- stable/11/contrib/bmake/bmake.cat1 Fri Jul 28 12:22:32 2017
(r321652)
+++ stable/11/contrib/bmake/bmake.cat1 Fri Jul 28 15:43:36 2017
(r321653)
@@ -6,8 +6,8 @@ NNAAMMEE
SSYYNNOOPPSSIISS
bbmmaakkee [--BBeeiikkNNnnqqrrssttWWwwXX] [--CC
_d_i_r_e_c_t_o_r_y] [--DD _v_a_r_i_a_b_l_e] [--dd
_f_l_a_g_s]
[--ff _m_a_k_e_f_i_l_e] [--II
_d_i_r_e_c_t_o_r_y] [--JJ _p_r_i_v_a_t_e] [--jj
_m_a_x___j_o_b_s]
- [--mm _d_i_r_e_c_t_o_r_y] [--TT _f_i_l_e] [--VV
_v_a_r_i_a_b_l_e] [_v_a_r_i_a_b_l_e_=_v_a_l_u_e]
- [_t_a_r_g_e_t _._._.]
+ [--mm _d_i_r_e_c_t_o_r_y] [--TT _f_i_l_e] [--VV
_v_a_r_i_a_b_l_e] [--vv _v_a_r_i_a_b_l_e]
+ [_v_a_r_i_a_b_l_e_=_v_a_l_u_e] [_t_a_r_g_e_t
_._._.]
DDEESSCCRRIIPPTTIIOONN
bbmmaakkee is a program designed to simplify the maintenance of
other pro-
@@ -118,7 +118,9 @@ DDEESSCCRRIIPPTTIIOONN
_t Print debugging information about target list mainte-
nance.
- _V Force the --VV option to print raw values of
variables.
+ _V Force the --VV option to print raw values of
variables,
+ overriding the default behavior set via
+
_._M_A_K_E_._E_X_P_A_N_D___V_A_R_I_A_B_L_E_S.
_v Print debugging information about variable assignment.
@@ -209,13 +211,26 @@ DDEESSCCRRIIPPTTIIOONN
to-date.
--VV _v_a_r_i_a_b_l_e
- Print bbmmaakkee's idea of the value of
_v_a_r_i_a_b_l_e, in the global con-
- text. Do not build any targets. Multiple instances of this
- option may be specified; the variables will be printed one per
- line, with a blank line for each null or undefined variable. If
- _v_a_r_i_a_b_l_e contains a `$' then the value will be
expanded before
- printing.
+ Print the value of _v_a_r_i_a_b_l_e. Do not build any
targets. Multiple
+ instances of this option may be specified; the variables will be
+ printed one per line, with a blank line for each null or unde-
+ fined variable. The value printed is extracted from the global
+ context after all makefiles have been read. By default, the raw
+ variable contents (which may include additional unexpanded vari-
+ able references) are shown. If _v_a_r_i_a_b_l_e contains
a `$' then the
+ value will be recursively expanded to its complete resultant text
+ before printing. The expanded value will also be printed if
+
_._M_A_K_E_._E_X_P_A_N_D___V_A_R_I_A_B_L_E_S is set to
true and the --ddVV option has not
+ been used to override it. Note that loop-local and target-local
+ variables, as well as values taken temporarily by global vari-
+ ables during makefile processing, are not accessible via this
+ option. The --ddvv debug mode can be used to see these at the
cost
+ of generating substantial extraneous output.
+ --vv _v_a_r_i_a_b_l_e
+ Like --VV but the variable is always expanded to its complete
+ value.
+
--WW Treat any warnings during makefile parsing as errors.
--ww Print entering and leaving directory messages, pre and post
pro-
@@ -488,7 +503,10 @@ VVAARRIIAABBLLEE AASSSSIIGGNNMMEENNT
_._M_A_K_E_._E_X_P_A_N_D___V_A_R_I_A_B_L_E_S
A boolean that controls the default behavior of the --VV
- option.
+ option. If true, variable values printed with --VV are
+ fully expanded; if false, the raw variable contents
+ (which may include additional unexpanded variable refer-
+ ences) are shown.
_._M_A_K_E_._E_X_P_O_R_T_E_D The list of variables
exported by bbmmaakkee.
@@ -1523,4 +1541,4 @@ BBUUGGSS
There is no way of escaping a space character in a filename.
-NetBSD 7.1_RC1 February 1, 2017 NetBSD 7.1_RC1
+NetBSD 7.1_RC1 June 22, 2017 NetBSD 7.1_RC1
Modified: stable/11/contrib/bmake/buf.h
==============================================================================
--- stable/11/contrib/bmake/buf.h Fri Jul 28 12:22:32 2017
(r321652)
+++ stable/11/contrib/bmake/buf.h Fri Jul 28 15:43:36 2017
(r321653)
@@ -1,4 +1,4 @@
-/* $NetBSD: buf.h,v 1.17 2012/04/24 20:26:58 sjg Exp $ */
+/* $NetBSD: buf.h,v 1.19 2017/05/31 22:02:06 maya Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -77,8 +77,8 @@
* Header for users of the buf library.
*/
-#ifndef _BUF_H
-#define _BUF_H
+#ifndef MAKE_BUF_H
+#define MAKE_BUF_H
typedef char Byte;
@@ -116,4 +116,4 @@ void Buf_Init(Buffer *, int);
Byte *Buf_Destroy(Buffer *, Boolean);
Byte *Buf_DestroyCompact(Buffer *);
-#endif /* _BUF_H */
+#endif /* MAKE_BUF_H */
Modified: stable/11/contrib/bmake/compat.c
==============================================================================
--- stable/11/contrib/bmake/compat.c Fri Jul 28 12:22:32 2017
(r321652)
+++ stable/11/contrib/bmake/compat.c Fri Jul 28 15:43:36 2017
(r321653)
@@ -1,4 +1,4 @@
-/* $NetBSD: compat.c,v 1.106 2016/08/26 23:28:39 dholland Exp $ */
+/* $NetBSD: compat.c,v 1.107 2017/07/20 19:29:54 sjg Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -70,14 +70,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: compat.c,v 1.106 2016/08/26 23:28:39 dholland
Exp $";
+static char rcsid[] = "$NetBSD: compat.c,v 1.107 2017/07/20 19:29:54 sjg Exp
$";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)compat.c 8.2 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: compat.c,v 1.106 2016/08/26 23:28:39 dholland Exp $");
+__RCSID("$NetBSD: compat.c,v 1.107 2017/07/20 19:29:54 sjg Exp $");
#endif
#endif /* not lint */
#endif
@@ -118,6 +118,8 @@ __RCSID("$NetBSD: compat.c,v 1.106 2016/08/26 23:28:39
static GNode *curTarg = NULL;
static GNode *ENDNode;
static void CompatInterrupt(int);
+static pid_t compatChild;
+static int compatSigno;
/*
* CompatDeleteTarget -- delete a failed, interrupted, or otherwise
@@ -176,8 +178,17 @@ CompatInterrupt(int signo)
}
if (signo == SIGQUIT)
_exit(signo);
- bmake_signal(signo, SIG_DFL);
- kill(myPid, signo);
+ /*
+ * If there is a child running, pass the signal on
+ * we will exist after it has exited.
+ */
+ compatSigno = signo;
+ if (compatChild > 0) {
+ KILLPG(compatChild, signo);
+ } else {
+ bmake_signal(signo, SIG_DFL);
+ kill(myPid, signo);
+ }
}
/*-
@@ -370,7 +381,7 @@ again:
/*
* Fork and execute the single command. If the fork fails, we abort.
*/
- cpid = vFork();
+ compatChild = cpid = vFork();
if (cpid < 0) {
Fatal("Could not fork");
}
@@ -483,7 +494,12 @@ again:
}
}
free(cmdStart);
-
+ compatChild = 0;
+ if (compatSigno) {
+ bmake_signal(compatSigno, SIG_DFL);
+ kill(myPid, compatSigno);
+ }
+
return (status);
}
Modified: stable/11/contrib/bmake/dir.h
==============================================================================
--- stable/11/contrib/bmake/dir.h Fri Jul 28 12:22:32 2017
(r321652)
+++ stable/11/contrib/bmake/dir.h Fri Jul 28 15:43:36 2017
(r321653)
@@ -1,4 +1,4 @@
-/* $NetBSD: dir.h,v 1.15 2012/04/07 18:29:08 christos Exp $ */
+/* $NetBSD: dir.h,v 1.18 2017/05/31 22:02:06 maya Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -75,8 +75,8 @@
/* dir.h --
*/
-#ifndef _DIR
-#define _DIR
+#ifndef MAKE_DIR_H
+#define MAKE_DIR_H
typedef struct Path {
char *name; /* Name of directory */
@@ -105,4 +105,4 @@ void Dir_PrintPath(Lst);
void Dir_Destroy(void *);
void * Dir_CopyDir(void *);
-#endif /* _DIR */
+#endif /* MAKE_DIR_H */
Modified: stable/11/contrib/bmake/hash.h
==============================================================================
--- stable/11/contrib/bmake/hash.h Fri Jul 28 12:22:32 2017
(r321652)
+++ stable/11/contrib/bmake/hash.h Fri Jul 28 15:43:36 2017
(r321653)
@@ -1,4 +1,4 @@
-/* $NetBSD: hash.h,v 1.11 2016/06/07 00:40:00 sjg Exp $ */
+/* $NetBSD: hash.h,v 1.12 2017/05/31 21:07:03 maya Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -78,8 +78,8 @@
* which maintains hash tables.
*/
-#ifndef _HASH
-#define _HASH
+#ifndef _HASH_H
+#define _HASH_H
/*
* The following defines one entry in the hash table.
@@ -146,4 +146,4 @@ void Hash_DeleteEntry(Hash_Table *, Hash_Entry *);
Hash_Entry *Hash_EnumFirst(Hash_Table *, Hash_Search *);
Hash_Entry *Hash_EnumNext(Hash_Search *);
-#endif /* _HASH */
+#endif /* _HASH_H */
Modified: stable/11/contrib/bmake/job.c
==============================================================================
--- stable/11/contrib/bmake/job.c Fri Jul 28 12:22:32 2017
(r321652)
+++ stable/11/contrib/bmake/job.c Fri Jul 28 15:43:36 2017
(r321653)
@@ -1,4 +1,4 @@
-/* $NetBSD: job.c,v 1.190 2017/04/16 21:23:43 riastradh Exp $ */
+/* $NetBSD: job.c,v 1.191 2017/07/20 19:29:54 sjg Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -70,14 +70,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: job.c,v 1.190 2017/04/16 21:23:43 riastradh
Exp $";
+static char rcsid[] = "$NetBSD: job.c,v 1.191 2017/07/20 19:29:54 sjg Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)job.c 8.2 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: job.c,v 1.190 2017/04/16 21:23:43 riastradh Exp $");
+__RCSID("$NetBSD: job.c,v 1.191 2017/07/20 19:29:54 sjg Exp $");
#endif
#endif /* not lint */
#endif
@@ -364,11 +364,6 @@ static Job childExitJob; /* child exit pseudo-job */
(void)fprintf(fp, TARG_FMT, targPrefix, gn->name)
static sigset_t caught_signals; /* Set of signals we handle */
-#if defined(SYSV)
-#define KILLPG(pid, sig) kill(-(pid), (sig))
-#else
-#define KILLPG(pid, sig) killpg((pid), (sig))
-#endif
static void JobChildSig(int);
static void JobContinueSig(int);
Modified: stable/11/contrib/bmake/main.c
==============================================================================
--- stable/11/contrib/bmake/main.c Fri Jul 28 12:22:32 2017
(r321652)
+++ stable/11/contrib/bmake/main.c Fri Jul 28 15:43:36 2017
(r321653)
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.265 2017/05/10 22:26:14 sjg Exp $ */
+/* $NetBSD: main.c,v 1.272 2017/06/19 19:58:24 christos Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,7 +69,7 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: main.c,v 1.265 2017/05/10 22:26:14 sjg Exp $";
+static char rcsid[] = "$NetBSD: main.c,v 1.272 2017/06/19 19:58:24 christos
Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
@@ -81,7 +81,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993
#if 0
static char sccsid[] = "@(#)main.c 8.3 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: main.c,v 1.265 2017/05/10 22:26:14 sjg Exp $");
+__RCSID("$NetBSD: main.c,v 1.272 2017/06/19 19:58:24 christos Exp $");
#endif
#endif /* not lint */
#endif
@@ -159,7 +159,9 @@ Boolean deleteOnError; /*
.DELETE_ON_ERROR: set */
static Boolean noBuiltins; /* -r flag */
static Lst makefiles; /* ordered list of makefiles to read */
-static Boolean printVars; /* print value of one or more vars */
+static int printVars; /* -[vV] argument */
+#define COMPAT_VARS 1
+#define EXPAND_VARS 2
static Lst variables; /* list of variables to print */
int maxJobs; /* -j argument */
static int maxJobTokens; /* -j argument */
@@ -421,7 +423,7 @@ MainParseArgs(int argc, char **argv)
Boolean inOption, dashDash = FALSE;
char found_path[MAXPATHLEN + 1]; /* for searching for sys.mk */
-#define OPTFLAGS "BC:D:I:J:NST:V:WXd:ef:ij:km:nqrstw"
+#define OPTFLAGS "BC:D:I:J:NST:V:WXd:ef:ij:km:nqrstv:w"
/* Can't actually use getopt(3) because rescanning is not portable */
getopt_def = OPTFLAGS;
@@ -546,8 +548,9 @@ rearg:
Var_Append(MAKEFLAGS, argvalue, VAR_GLOBAL);
break;
case 'V':
+ case 'v':
if (argvalue == NULL) goto noarg;
- printVars = TRUE;
+ printVars = c == 'v' ? EXPAND_VARS : COMPAT_VARS;
(void)Lst_AtEnd(variables, argvalue);
Var_Append(MAKEFLAGS, "-V", VAR_GLOBAL);
Var_Append(MAKEFLAGS, argvalue, VAR_GLOBAL);
@@ -877,6 +880,89 @@ MakeMode(const char *mode)
free(mp);
}
+static void
+doPrintVars(void)
+{
+ LstNode ln;
+ Boolean expandVars;
+
+ if (printVars == EXPAND_VARS)
+ expandVars = TRUE;
+ else if (debugVflag)
+ expandVars = FALSE;
+ else
+ expandVars = getBoolean(".MAKE.EXPAND_VARIABLES", FALSE);
+
+ for (ln = Lst_First(variables); ln != NULL;
+ ln = Lst_Succ(ln)) {
+ char *var = (char *)Lst_Datum(ln);
+ char *value;
+ char *p1;
+
+ if (strchr(var, '$')) {
+ value = p1 = Var_Subst(NULL, var, VAR_GLOBAL,
+ VARF_WANTRES);
+ } else if (expandVars) {
+ char tmp[128];
+ int len = snprintf(tmp, sizeof(tmp), "${%s}", var);
+
+ if (len >= (int)sizeof(tmp))
+ Fatal("%s: variable name too big: %s",
+ progname, var);
+ value = p1 = Var_Subst(NULL, tmp, VAR_GLOBAL,
+ VARF_WANTRES);
+ } else {
+ value = Var_Value(var, VAR_GLOBAL, &p1);
+ }
+ printf("%s\n", value ? value : "");
+ free(p1);
+ }
+}
+
+static Boolean
+runTargets(void)
+{
+ Lst targs; /* target nodes to create -- passed to Make_Init */
+ Boolean outOfDate; /* FALSE if all targets up to date */
+
+ /*
+ * Have now read the entire graph and need to make a list of
+ * targets to create. If none was given on the command line,
+ * we consult the parsing module to find the main target(s)
+ * to create.
+ */
+ if (Lst_IsEmpty(create))
+ targs = Parse_MainName();
+ else
+ targs = Targ_FindList(create, TARG_CREATE);
+
+ if (!compatMake) {
+ /*
+ * Initialize job module before traversing the graph
+ * now that any .BEGIN and .END targets have been read.
+ * This is done only if the -q flag wasn't given
+ * (to prevent the .BEGIN from being executed should
+ * it exist).
+ */
+ if (!queryFlag) {
+ Job_Init();
+ jobsRunning = TRUE;
+ }
+
+ /* Traverse the graph, checking on all the targets */
+ outOfDate = Make_Run(targs);
+ } else {
+ /*
+ * Compat_Init will take care of creating all the
+ * targets as well as initializing the module.
+ */
+ Compat_Run(targs);
+ outOfDate = FALSE;
+ }
+ Lst_Destroy(targs, NULL);
+ return outOfDate;
+}
+
/*-
* main --
* The main function, for obvious reasons. Initializes variables
@@ -897,8 +983,7 @@ MakeMode(const char *mode)
int
main(int argc, char **argv)
{
- Lst targs; /* target nodes to create -- passed to Make_Init */
- Boolean outOfDate = FALSE; /* FALSE if all targets up to date */
+ Boolean outOfDate; /* FALSE if all targets up to date */
struct stat sb, sa;
char *p1, *path;
char mdpath[MAXPATHLEN];
@@ -1027,7 +1112,7 @@ main(int argc, char **argv)
create = Lst_Init(FALSE);
makefiles = Lst_Init(FALSE);
- printVars = FALSE;
+ printVars = 0;
debugVflag = FALSE;
variables = Lst_Init(FALSE);
beSilent = FALSE; /* Print commands as executed */
@@ -1406,73 +1491,13 @@ main(int argc, char **argv)
/* print the values of any variables requested by the user */
if (printVars) {
- LstNode ln;
- Boolean expandVars;
-
- if (debugVflag)
- expandVars = FALSE;
- else
- expandVars = getBoolean(".MAKE.EXPAND_VARIABLES",
FALSE);
- for (ln = Lst_First(variables); ln != NULL;
- ln = Lst_Succ(ln)) {
- char *var = (char *)Lst_Datum(ln);
- char *value;
-
- if (strchr(var, '$')) {
- value = p1 = Var_Subst(NULL, var, VAR_GLOBAL,
- VARF_WANTRES);
- } else if (expandVars) {
- char tmp[128];
-
- if (snprintf(tmp, sizeof(tmp), "${%s}", var) >=
(int)(sizeof(tmp)))
- Fatal("%s: variable name too big: %s",
- progname, var);
- value = p1 = Var_Subst(NULL, tmp, VAR_GLOBAL,
- VARF_WANTRES);
- } else {
- value = Var_Value(var, VAR_GLOBAL, &p1);
- }
- printf("%s\n", value ? value : "");
- free(p1);
- }
+ doPrintVars();
+ outOfDate = FALSE;
} else {
- /*
- * Have now read the entire graph and need to make a list of
- * targets to create. If none was given on the command line,
- * we consult the parsing module to find the main target(s)
- * to create.
- */
- if (Lst_IsEmpty(create))
- targs = Parse_MainName();
- else
- targs = Targ_FindList(create, TARG_CREATE);
-
- if (!compatMake) {
- /*
- * Initialize job module before traversing the graph
- * now that any .BEGIN and .END targets have been read.
- * This is done only if the -q flag wasn't given
- * (to prevent the .BEGIN from being executed should
- * it exist).
- */
- if (!queryFlag) {
- Job_Init();
- jobsRunning = TRUE;
- }
-
- /* Traverse the graph, checking on all the targets */
- outOfDate = Make_Run(targs);
- } else {
- /*
- * Compat_Init will take care of creating all the
- * targets as well as initializing the module.
- */
- Compat_Run(targs);
- }
+ outOfDate = runTargets();
}
#ifdef CLEANUP
- Lst_Destroy(targs, NULL);
Lst_Destroy(variables, NULL);
Lst_Destroy(makefiles, NULL);
Lst_Destroy(create, (FreeProc *)free);
@@ -1931,7 +1956,8 @@ usage(void)
"usage: %s [-BeikNnqrstWwX] \n\
[-C directory] [-D variable] [-d flags] [-f makefile]\n\
[-I directory] [-J private] [-j max_jobs] [-m directory] [-T
file]\n\
- [-V variable] [variable=value] [target ...]\n", progname);
+ [-V variable] [-v variable] [variable=value] [target ...]\n",
+ progname);
exit(2);
}
Modified: stable/11/contrib/bmake/make.1
==============================================================================
--- stable/11/contrib/bmake/make.1 Fri Jul 28 12:22:32 2017
(r321652)
+++ stable/11/contrib/bmake/make.1 Fri Jul 28 15:43:36 2017
(r321653)
@@ -1,4 +1,4 @@
-.\" $NetBSD: make.1,v 1.266 2017/02/01 18:39:27 sjg Exp $
+.\" $NetBSD: make.1,v 1.271 2017/07/03 21:34:20 wiz 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 February 1, 2017
+.Dd June 22, 2017
.Dt MAKE 1
.Os
.Sh NAME
@@ -48,6 +48,7 @@
.Op Fl m Ar directory
.Op Fl T Ar file
.Op Fl V Ar variable
+.Op Fl v Ar variable
.Op Ar variable=value
.Op Ar target ...
.Sh DESCRIPTION
@@ -206,7 +207,9 @@ Print debugging information about target list maintena
.It Ar V
Force the
.Fl V
-option to print raw values of variables.
+option to print raw values of variables, overriding the default behavior
+set via
+.Va .MAKE.EXPAND_VARIABLES .
.It Ar v
Print debugging information about variable assignment.
.It Ar x
@@ -334,20 +337,39 @@ for each job started and completed.
Rather than re-building a target as specified in the makefile, create it
or update its modification time to make it appear up-to-date.
.It Fl V Ar variable
-Print
-.Nm Ns 's
-idea of the value of
-.Ar variable ,
-in the global context.
+Print the value of
+.Ar variable .
Do not build any targets.
Multiple instances of this option may be specified;
the variables will be printed one per line,
with a blank line for each null or undefined variable.
+The value printed is extracted from the global context after all
+makefiles have been read.
+By default, the raw variable contents (which may
+include additional unexpanded variable references) are shown.
If
.Ar variable
contains a
.Ql \&$
-then the value will be expanded before printing.
+then the value will be recursively expanded to its complete resultant
+text before printing.
+The expanded value will also be printed if
+.Va .MAKE.EXPAND_VARIABLES
+is set to true and
+the
+.Fl dV
+option has not been used to override it.
+Note that loop-local and target-local variables, as well as values
+taken temporarily by global variables during makefile processing, are
+not accessible via this option.
+The
+.Fl dv
+debug mode can be used to see these at the cost of generating
+substantial extraneous output.
+.It Fl v Ar variable
+Like
+.Fl V
+but the variable is always expanded to its complete value.
.It Fl W
Treat any warnings during makefile parsing as errors.
.It Fl w
@@ -657,7 +679,7 @@ The seven local variables are as follows:
.Bl -tag -width ".ARCHIVE" -offset indent
.It Va .ALLSRC
The list of all sources for this target; also known as
-.Ql Va \&\*[Gt] .
+.Ql Va \&> .
.It Va .ARCHIVE
The name of the archive file; also known as
.Ql Va \&! .
@@ -666,7 +688,7 @@ In suffix-transformation rules, the name/path of the s
target is to be transformed (the
.Dq implied
source); also known as
-.Ql Va \&\*[Lt] .
+.Ql Va \&< .
It is not defined in explicit rules.
.It Va .MEMBER
The name of the archive member; also known as
@@ -691,9 +713,9 @@ in archive member rules.
.El
.Pp
The shorter forms
-.Ql ( Va \*[Gt] ,
+.Ql ( Va > ,
.Ql Va \&! ,
-.Ql Va \*[Lt] ,
+.Ql Va < ,
.Ql Va % ,
.Ql Va \&? ,
.Ql Va * ,
@@ -787,6 +809,10 @@ from which generated dependencies are read.
A boolean that controls the default behavior of the
.Fl V
option.
+If true, variable values printed with
+.Fl V
+are fully expanded; if false, the raw variable contents (which may
+include additional unexpanded variable references) are shown.
.It Va .MAKE.EXPORTED
The list of variables exported by
.Nm .
@@ -1298,7 +1324,7 @@ it is anchored at the end of each word.
Inside
.Ar new_string ,
an ampersand
-.Pq Ql \*[Am]
+.Pq Ql &
is replaced by
.Ar old_string
(without any
@@ -1762,7 +1788,7 @@ may be any one of the following:
.Bl -tag -width "Cm XX"
.It Cm \&|\&|
Logical OR.
-.It Cm \&\*[Am]\*[Am]
+.It Cm \&&&
Logical
.Tn AND ;
of higher precedence than
@@ -1779,7 +1805,7 @@ The boolean operator
may be used to logically negate an entire
conditional.
It is of higher precedence than
-.Ql Ic \&\*[Am]\*[Am] .
+.Ql Ic \&&& .
.Pp
The value of
.Ar expression
Modified: stable/11/contrib/bmake/make.h
==============================================================================
--- stable/11/contrib/bmake/make.h Fri Jul 28 12:22:32 2017
(r321652)
+++ stable/11/contrib/bmake/make.h Fri Jul 28 15:43:36 2017
(r321653)
@@ -1,4 +1,4 @@
-/* $NetBSD: make.h,v 1.102 2016/12/07 15:00:46 christos Exp $ */
+/* $NetBSD: make.h,v 1.103 2017/07/20 19:29:54 sjg Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -541,6 +541,12 @@ int cached_stat(const char *, void *);
#endif
#ifndef PATH_MAX
#define PATH_MAX MAXPATHLEN
+#endif
+
+#if defined(SYSV)
+#define KILLPG(pid, sig) kill(-(pid), (sig))
+#else
+#define KILLPG(pid, sig) killpg((pid), (sig))
#endif
#endif /* _MAKE_H_ */
Modified: stable/11/contrib/bmake/meta.c
==============================================================================
--- stable/11/contrib/bmake/meta.c Fri Jul 28 12:22:32 2017
(r321652)
+++ stable/11/contrib/bmake/meta.c Fri Jul 28 15:43:36 2017
(r321653)
@@ -1,4 +1,4 @@
-/* $NetBSD: meta.c,v 1.67 2016/08/17 15:52:42 sjg Exp $ */
+/* $NetBSD: meta.c,v 1.68 2017/07/09 04:54:00 sjg Exp $ */
/*
* Implement 'meta' mode.
@@ -727,7 +727,7 @@ meta_job_error(Job *job, GNode *gn, int flags, int sta
pbm = &Mybm;
}
if (pbm->mfp != NULL) {
- fprintf(pbm->mfp, "*** Error code %d%s\n",
+ fprintf(pbm->mfp, "\n*** Error code %d%s\n",
status,
(flags & JOB_IGNERR) ?
"(ignored)" : "");
@@ -782,13 +782,13 @@ int
meta_cmd_finish(void *pbmp)
{
int error = 0;
-#ifdef USE_FILEMON
BuildMon *pbm = pbmp;
int x;
if (!pbm)
pbm = &Mybm;
+#ifdef USE_FILEMON
if (pbm->filemon_fd >= 0) {
if (close(pbm->filemon_fd) < 0)
error = errno;
@@ -796,8 +796,9 @@ meta_cmd_finish(void *pbmp)
if (error == 0 && x != 0)
error = x;
pbm->filemon_fd = pbm->mon_fd = -1;
- }
+ } else
#endif
+ fprintf(pbm->mfp, "\n"); /* ensure end with newline */
return error;
}
@@ -861,6 +862,8 @@ fgetLine(char **bufp, size_t *szp, int o, FILE *fp)
newsz = ROUNDUP((fs.st_size / 2), BUFSIZ);
if (newsz <= bufsz)
newsz = ROUNDUP(fs.st_size, BUFSIZ);
+ if (newsz <= bufsz)
+ return x; /* truncated */
if (DEBUG(META))
fprintf(debug_file, "growing buffer %u -> %u\n",
(unsigned)bufsz, (unsigned)newsz);
@@ -948,10 +951,10 @@ meta_ignore(GNode *gn, const char *p)
if (metaIgnorePatterns) {
char *pm;
- snprintf(fname, sizeof(fname),
- "${%s:@m@${%s:L:M$m}@}",
- MAKE_META_IGNORE_PATTERNS, p);
- pm = Var_Subst(NULL, fname, gn, VARF_WANTRES);
+ Var_Set(".p.", p, gn, 0);
+ pm = Var_Subst(NULL,
+ "${" MAKE_META_IGNORE_PATTERNS ":@m@${.p.:M$m}@}",
+ gn, VARF_WANTRES);
if (*pm) {
#ifdef DEBUG_META_MODE
if (DEBUG(META))
Modified: stable/11/contrib/bmake/mk/ChangeLog
==============================================================================
--- stable/11/contrib/bmake/mk/ChangeLog Fri Jul 28 12:22:32 2017
(r321652)
+++ stable/11/contrib/bmake/mk/ChangeLog Fri Jul 28 15:43:36 2017
(r321653)
@@ -1,3 +1,22 @@
+2017-06-30 Simon J. Gerraty <s...@bad.crufty.net>
+
+ * install-mk (MK_VERSION): 20170630
+
+ * meta.stage.mk: avoid triggering stage_* targets with nothing to do.
+
+2017-05-23 Simon J. Gerraty <s...@bad.crufty.net>
+
+ * meta2deps.py: take special care of '..'
+
+2017-05-15 Simon J. Gerraty <s...@bad.crufty.net>
+
+ * install-mk (MK_VERSION): 20170515
+
+ * dirdeps.mk (DEP_EXPORT_VARS): on rare occasions it is
+ useful/necessary for a Makefile.depend file to export some knobs.
+ This is complicated when we are doing DIRDEPS_CACHE, so we will
+ handle export of any variables listed in DEP_EXPORT_VARS.
+
2017-05-08 Simon J. Gerraty <s...@bad.crufty.net>
* install-mk (MK_VERSION): 20170505
Modified: stable/11/contrib/bmake/mk/dirdeps.mk
==============================================================================
--- stable/11/contrib/bmake/mk/dirdeps.mk Fri Jul 28 12:22:32 2017
(r321652)
+++ stable/11/contrib/bmake/mk/dirdeps.mk Fri Jul 28 15:43:36 2017
(r321653)
@@ -1,4 +1,4 @@
-# $Id: dirdeps.mk,v 1.88 2017/04/24 20:34:59 sjg Exp $
+# $Id: dirdeps.mk,v 1.89 2017/05/17 17:41:47 sjg Exp $
# Copyright (c) 2010-2013, Juniper Networks, Inc.
# All rights reserved.
@@ -636,6 +636,11 @@ _build_all_dirs := ${_build_all_dirs:O:u}
x!= { echo; echo '\# ${DEP_RELDIR}.${DEP_TARGET_SPEC}'; \
echo 'dirdeps: ${_build_all_dirs:${M_oneperline}}'; echo; } >&3; echo
x!= { ${_build_all_dirs:@x@${target($x):?:echo '$x: _DIRDEP_USE';}@} echo; }
>&3; echo
+.if !empty(DEP_EXPORT_VARS)
+# Discouraged, but there are always exceptions.
+# Handle it here rather than explain how.
+x!= { echo; ${DEP_EXPORT_VARS:@v@echo '$v=${$v}';@} echo '.export
${DEP_EXPORT_VARS}'; echo; } >&3; echo
+.endif
.else
# this makes it all happen
dirdeps: ${_build_all_dirs}
@@ -644,6 +649,11 @@ ${_build_all_dirs}: _DIRDEP_USE
.if ${_debug_reldir}
.info ${DEP_RELDIR}.${DEP_TARGET_SPEC}: needs: ${_build_dirs}
+.endif
+
+.if !empty(DEP_EXPORT_VARS)
+.export ${DEP_EXPORT_VARS}
+DEP_EXPORT_VARS=
.endif
# this builds the dependency graph
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
