From nobody Wed Feb 16 05:38:53 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 3C78119C7CFF; Wed, 16 Feb 2022 05:38:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Jz6Fp1KW3z3krR; Wed, 16 Feb 2022 05:38:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644989934; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0VMoKpbH8/rFU86xGMrbwfJQMxn2MidY8MP1TIp4pSA=; b=kbxUkThOjWqYbPMfx6Fvg7x3/f0Yo2+TyytsypB/yzDAtVSWkpr5WGfyfxkQqWvkeofO6U WXqVx8N3P0kSfN47vvO4yRGk75SxmYayxQJwvwGmFhKgFQPhPzWdigVu59u7ETQfe3QF76 BEX7qZ0sJVQ8ZkVDeAN8vKAzNjl6Roh190fMfywyVScCwTnrLeRhCpgVv4AIH3SC3rKlCa dGFaqUyj1k8WkhYT1t9INakDT/DPs2LdRz52Kvu3dm8KrkY/c87u8irVdzkUAhjiLQ8bBW DblsZrMvHsIALw5zzwK7odTZC+35/+GfMQn+4P6VLhaWKs2f0NUsW56nG8jpPA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D5AE310863; Wed, 16 Feb 2022 05:38:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21G5crk4059645; Wed, 16 Feb 2022 05:38:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21G5crIq059644; Wed, 16 Feb 2022 05:38:53 GMT (envelope-from git) Date: Wed, 16 Feb 2022 05:38:53 GMT Message-Id: <202202160538.21G5crIq059644@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Simon J. Gerraty" Subject: git: 14f3c857000e - stable/13 - make: fix MAKE_JOB_ERROR_TOKEN List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sjg X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 14f3c857000eda18d6426500a0f47fe9203fee21 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644989934; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0VMoKpbH8/rFU86xGMrbwfJQMxn2MidY8MP1TIp4pSA=; b=jwTv7Ws3L6EvXxcIZGSc/cVPeT1jtm7frBBxtxpndwI2tAyEvB85gcBAXWDjxHPFNtFl/M rsQEzK3CDOIebx90mudM4umWYBHiDh8ioWFZspgaCnw3cQsqAqYnW5ol1UkoqWLKB5QQQW FdW9sRnfO9evqgAtIN8x3E1XuYOhxoWbIhQE253AhWvvnCxoCDwtSGBZkc6T4ioRmHKuGw hLS0qpa/dTp5owVobR5YnbU4WxmAx8QNU8k48NFXt5rJVU1v7j+Hul8+z4UZi0EgIfX3mh PiKKxZR4Mh6FNI1rrdoNkjBpAfgFogEOJhCAjj6jqnulDK8b5w1wT3efov7BOw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644989934; a=rsa-sha256; cv=none; b=osRAZqARBMR0qtCZ8QdCSw1gd2gvkUah3CQdh6o3O3G6MKf6sToDxG4wNyl6i4kyGV1QH5 YG25F0R/wPxDUljFdJS4aEaFE2RjsQos+zSj5Qb0wLQ95A3WvgEcrO2Dlt9cASQ4dynZqJ 1UyegCIHcrxJAGrAgksOlVzUyzmk9Pa4xhICcN0d4lL5hkb61JlrJjgoezHvcCZzPaYg/n VUk3+Dpr7fYVE2wz3quTtIEui1mnnkv0UBTgVy/TYu+Oee1A1k1u+Dz+/IRBEPQnHw6grt J8Tnpd893yg3ABiOFxKFsrGIARj9O6Cmtg12eFRwhtl+1xZPhpquMHQLurLgig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=14f3c857000eda18d6426500a0f47fe9203fee21 commit 14f3c857000eda18d6426500a0f47fe9203fee21 Author: Simon J. Gerraty AuthorDate: 2021-09-10 20:11:28 +0000 Commit: Simon J. Gerraty CommitDate: 2022-02-16 05:37:06 +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: # Reported by: # Reviewed by: # Approved by: # Obtained from: # MFC after: # MFH: # Relnotes: # Security: # Sponsored by: # Pull Request: /pull/###> # Differential Revision: # # "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. # # 72 columns --| # # Uncomment and complete these metadata fields, as appropriate: # # PR: # Reported by: # Reviewed by: # Approved by: # Obtained from: # MFC after: # MFH: # Relnotes: # Security: # Sponsored by: # Pull Request: /pull/###> # Differential Revision: # # "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: # Reviewed by: # Approved by: # Obtained from: # MFC after: # MFH: # Relnotes: # Security: # Sponsored by: # Pull Request: /pull/###> # Differential Revision: # # "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. # (cherry picked from commit 3b96abbab03327176b1e4ee02a6742bf9807dd75) --- 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 @@ -261,7 +261,7 @@ 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 @@ -269,7 +269,7 @@ 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; /*