Fwd: git: 3b96abbab033 - main - make: fix MAKE_JOB_ERROR_TOKEN

From: John Baldwin <jhb_at_FreeBSD.org>
Date: Fri, 10 Sep 2021 15:29:59 -0700
Do the pre-push hooks check for log messages containing the template?  It
might be nice to reject pushes that add commits with the template in the
log message to help catch accidents.

-------- Forwarded Message --------
Subject: git: 3b96abbab033 - main - make: fix MAKE_JOB_ERROR_TOKEN
Date: Fri, 10 Sep 2021 20:11:54 GMT
From: Simon J. Gerraty <sjg_at_FreeBSD.org>
To: src-committers_at_FreeBSD.org, dev-commits-src-all_at_FreeBSD.org, dev-commits-src-main_at_FreeBSD.org

The branch main has been updated by sjg:

URL: https://cgit.FreeBSD.org/src/commit/?id=3b96abbab03327176b1e4ee02a6742bf9807dd75

commit 3b96abbab03327176b1e4ee02a6742bf9807dd75
Author:     Simon J. Gerraty <sjg_at_FreeBSD.org>
AuthorDate: 2021-09-10 20:11:28 +0000
Commit:     Simon J. Gerraty <sjg_at_FreeBSD.org>
CommitDate: 2021-09-10 20:11:28 +0000

     make: fix MAKE_JOB_ERROR_TOKEN
     
     The rework of GetBooleanVar to GetBooleanExpr requires
     we add "${" and ":U}" around the expression so it can be directly
     evaluated.
     
     Reported by: mjg
     MFC after: 1 week
     
     #
     #                                                         72 columns --|
     #
     # Uncomment and complete these metadata fields, as appropriate:
     #
     # PR:           <If and which Problem Report is related.>
     # Reported by:  <If someone else reported the issue.>
     # Reviewed by:  <If someone else reviewed your modification.>
     # Approved by:  <If you needed approval for this commit.>
     # Obtained from:        <If the change is from a third party.>
     # MFC after:    <N [day[s]|week[s]|month[s]].  Request a reminder email>
     # MFH:          <Ports tree branch name.  Request approval for merge.>
     # Relnotes:     <Set to 'yes' for mention in release notes.>
     # Security:     <Vulnerability reference (one per line) or description.>
     # Sponsored by: <If the change was sponsored by an organization.>
     # Pull Request: <https://github.com/freebsd/<repo>/pull/###>
     # Differential Revision:        <https://reviews.freebsd.org/D###>
     #
     # "Pull Request" and "Differential Revision" require the *full* GitHub or
     # Phabricator URL.  The commit author should be set appropriately, using
     # `git commit --author` if someone besides the committer sent in the change.
     #
     # Uncomment and complete these metadata fields, as appropriate:
     #
     # PR:
     # Reported by:  <If someone else reported the issue.>
     # Reviewed by:  <If someone else reviewed your modification.>
     # Approved by:  <If you needed approval for this commit.>
     # Obtained from:        <If the change is from a third party.>
     # MFC after:    <N [day[s]|week[s]|month[s]].  Request a reminder email>
     # MFH:          <Ports tree branch name.  Request approval for merge.>
     # Relnotes:     <Set to 'yes' for mention in release notes.>
     # Security:     <Vulnerability reference (one per line) or description.>
     # Sponsored by: <If the change was sponsored by an organization.>
     # Pull Request: <https://github.com/freebsd/<repo>/pull/###>
     # Differential Revision:        <https://reviews.freebsd.org/D###>
     #
     # "Pull Request" and "Differential Revision" require the *full* GitHub or
     # Phabricator URL.  The commit author should be set appropriately, using
     # `git commit --author` if someone besides the committer sent in the change.
     #
---
  contrib/bmake/job.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/bmake/job.c b/contrib/bmake/job.c
index ba2e5c827b0c..e4b77477e816 100644
--- a/contrib/bmake/job.c
+++ b/contrib/bmake/job.c
_at__at_ -261,7 +261,7 _at__at_ typedef struct ShellWriter {
   * pass jobs queue to sub-makes.
   * Use .MAKE.ALWAYS_PASS_JOB_QUEUE=no to disable.
   */
-#define MAKE_ALWAYS_PASS_JOB_QUEUE ".MAKE.ALWAYS_PASS_JOB_QUEUE"
+#define MAKE_ALWAYS_PASS_JOB_QUEUE "${.MAKE.ALWAYS_PASS_JOB_QUEUE:U}"
  static bool Always_pass_job_queue = true;
  /*
   * FreeBSD: aborting entire parallel make isn't always
_at__at_ -269,7 +269,7 _at__at_ static bool Always_pass_job_queue = true;
   * one architecture should not stop all.
   * We still want to bail on interrupt though.
   */
-#define MAKE_JOB_ERROR_TOKEN "MAKE_JOB_ERROR_TOKEN"
+#define MAKE_JOB_ERROR_TOKEN "${MAKE_JOB_ERROR_TOKEN:U}"
  static bool Job_error_token = true;
  
  /*
Received on Fri Sep 10 2021 - 22:29:59 UTC

Original text of this message