From nobody Sat May 13 17:08:26 2023 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 4QJXCL23ZSz4BZY2; Sat, 13 May 2023 17:08:30 +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 4QJXCL1ZVrz3Kmk; Sat, 13 May 2023 17:08:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683997710; 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=6QVhP0NOhJnxrLhjiVAfBHE7tOSxtiKdJEHICbqC7mc=; b=BY/qgpX8Q6MYvLQbImIifekcKMM1dmPuHZ6QCx9lvtFa1bidICtzivMCl2FM6K8XwsZ+21 5C8s5eiMZTFOpnkbLFpLw6EUpFIoSRftLSHc7Xl5cDnK1G+07816n83/k1m6wmFSh0fl64 wjSaTHQ91llNhjSvqcWmmhgE6EucYZOd7w0uY2SZmFXy0UvVPtwgwBW8d/S0UKWugpf/DC scAaSqMGebI6BGKMvbYT2XbeCVDM6HZpd8Ym7xXkacZGdJ3deiMperzwmfSROKObquWoZD we3ecNDetNnmpk/9bwauw2+97LVWhBWKyrn8P/wCL6I8cClZB6mPpzbHlOdLAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683997710; 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=6QVhP0NOhJnxrLhjiVAfBHE7tOSxtiKdJEHICbqC7mc=; b=Ny1oSaYKdX6ASPB2EArMN7vCx/bn12nRiPx3uC90sj4dTRgJtMESr5KtuOkjHUrzvzMBj3 ft+r12nCC7Jd7rIb3MQ5uWX2cqczmEXB+Fi6dM8Qmm67eP/6H3x65UyGN2wzvY6xsvVFq5 CAZ5HT6F7LjoqTsIwUEk816/QLPPvW+UwIU6Pt/J5RkvYS5PBETln/YGS2R/axpVAdvQHr ghmOZOD+HnBI98leirgIkgQjgNHes7BiQR/x/APdUhmFISZGmlayo5WyDoKpaCW59RrTDg cOYuHYkwcxrUOoTLYYQVuenP1PUSLPtIQflRWdPLwzfFbvpdep4eLxJEnTH8xg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683997710; a=rsa-sha256; cv=none; b=trmpGpOZTlhWwxSiagClI/hOoGftv2zFZG93cda3cZWpRuSYdOYqFueWmiSDsPJnR4xGhT umu8sG+TSUA/pVQj5SDJ+gCloViZ7rPDq7bIDvhhxJ4yQx2FYbWWbmb+B9e9Too4TBnuzH UrA8ROSukxL1kEGpXk+0W+rHDz6o2h7gI3VgIPUq4BUQVnxRDZdG5m/kubXC6hQ6ZZEBj/ bUNE6klNTOcfFsM5oUV/UKQKs4yx2liBJn9AuSDfg6ACnOGSoaZHk2JIfNoxjAD0WFjgdF xEdSgcPJiWqUQdCGdjVxt5EvqVkYbR/bO8Ba7mn8lLf4q9PKCj3nB7jd2aOYBw== 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 4QJXCL0X9rzQ8Q; Sat, 13 May 2023 17:08:30 +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 34DH8UpV065143; Sat, 13 May 2023 17:08:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34DH8QmE065140; Sat, 13 May 2023 17:08:26 GMT (envelope-from git) Date: Sat, 13 May 2023 17:08:26 GMT Message-Id: <202305131708.34DH8QmE065140@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Simon J. Gerraty" Subject: git: c1d01b5fd681 - main - Merge bmake-20230510 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/main X-Git-Reftype: branch X-Git-Commit: c1d01b5fd6811491ee6c05cf6982fd65343122c8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=c1d01b5fd6811491ee6c05cf6982fd65343122c8 commit c1d01b5fd6811491ee6c05cf6982fd65343122c8 Merge: da1ef2d61930 945078deae44 Author: Simon J. Gerraty AuthorDate: 2023-05-13 17:05:48 +0000 Commit: Simon J. Gerraty CommitDate: 2023-05-13 17:05:48 +0000 Merge bmake-20230510 Merge commit '945078deae448e0a13c34b3393d836087719fb16' contrib/bmake/ChangeLog | 24 ++ contrib/bmake/FILES | 4 +- contrib/bmake/VERSION | 2 +- contrib/bmake/bmake.1 | 33 +- contrib/bmake/bmake.cat1 | 17 +- contrib/bmake/compat.c | 6 +- contrib/bmake/for.c | 60 +++- contrib/bmake/make.1 | 33 +- contrib/bmake/mk/ChangeLog | 35 ++ contrib/bmake/mk/FILES | 2 + contrib/bmake/mk/dirdeps-targets.mk | 11 +- contrib/bmake/mk/dirdeps.mk | 16 +- contrib/bmake/mk/install-mk | 4 +- contrib/bmake/mk/jobs.mk | 17 +- contrib/bmake/mk/meta.autodep.mk | 6 +- contrib/bmake/mk/meta.sys.mk | 105 ++---- contrib/bmake/mk/mk-files.txt | 55 ++- contrib/bmake/mk/newlog.sh | 412 ++++++++++++++++++++++ contrib/bmake/mk/sys.dependfile.mk | 11 +- contrib/bmake/mk/sys.dirdeps.mk | 183 ++++++++++ contrib/bmake/mk/sys.mk | 5 +- contrib/bmake/parse.c | 27 +- contrib/bmake/unit-tests/Makefile | 6 +- contrib/bmake/unit-tests/cond-func.mk | 12 +- contrib/bmake/unit-tests/cond-late.mk | 15 +- contrib/bmake/unit-tests/dep-var.mk | 7 +- contrib/bmake/unit-tests/directive-for-errors.exp | 33 +- contrib/bmake/unit-tests/directive-for-errors.mk | 57 ++- contrib/bmake/unit-tests/directive-for-escape.exp | 84 ++--- contrib/bmake/unit-tests/directive-for-escape.mk | 62 +++- contrib/bmake/unit-tests/directive-for.exp | 63 ++-- contrib/bmake/unit-tests/directive-for.mk | 149 +++++--- contrib/bmake/unit-tests/forloop.exp | 20 -- contrib/bmake/unit-tests/forloop.mk | 53 --- contrib/bmake/unit-tests/parse.mk | 32 +- contrib/bmake/unit-tests/var-eval-short.exp | 8 +- contrib/bmake/unit-tests/var-eval-short.mk | 12 +- contrib/bmake/unit-tests/var-scope-local.exp | 54 ++- contrib/bmake/unit-tests/var-scope-local.mk | 101 ++++-- contrib/bmake/unit-tests/varmod-gmtime.exp | 20 +- contrib/bmake/unit-tests/varmod-gmtime.mk | 33 +- contrib/bmake/unit-tests/varmod-localtime.exp | 20 +- contrib/bmake/unit-tests/varmod-localtime.mk | 33 +- contrib/bmake/unit-tests/varmod-mtime.exp | 1 + contrib/bmake/unit-tests/varmod-mtime.mk | 30 ++ contrib/bmake/unit-tests/varmod-path.mk | 14 +- contrib/bmake/var.c | 119 ++++++- 47 files changed, 1547 insertions(+), 559 deletions(-) diff --cc contrib/bmake/mk/newlog.sh index 000000000000,526d1700d98f..526d1700d98f mode 000000,100755..100755 --- a/contrib/bmake/mk/newlog.sh +++ b/contrib/bmake/mk/newlog.sh diff --cc contrib/bmake/mk/sys.dirdeps.mk index 000000000000,845eda181b90..845eda181b90 mode 000000,100644..100644 --- a/contrib/bmake/mk/sys.dirdeps.mk +++ b/contrib/bmake/mk/sys.dirdeps.mk diff --cc contrib/bmake/unit-tests/varmod-mtime.exp index 000000000000,39a9383953dd..39a9383953dd mode 000000,100644..100644 --- a/contrib/bmake/unit-tests/varmod-mtime.exp +++ b/contrib/bmake/unit-tests/varmod-mtime.exp diff --cc contrib/bmake/unit-tests/varmod-mtime.mk index 000000000000,dd57ef3f0f31..dd57ef3f0f31 mode 000000,100644..100644 --- a/contrib/bmake/unit-tests/varmod-mtime.mk +++ b/contrib/bmake/unit-tests/varmod-mtime.mk