From owner-dev-commits-src-branches@freebsd.org Sat Jul 31 18:06:26 2021 Return-Path: Delivered-To: dev-commits-src-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1043F66238E; Sat, 31 Jul 2021 18:06:26 +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 4GcXJd6ngXz4pBn; Sat, 31 Jul 2021 18:06:25 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 D177B1D62E; Sat, 31 Jul 2021 18:06:25 +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 16VI6PgI066209; Sat, 31 Jul 2021 18:06:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16VI6PeP066208; Sat, 31 Jul 2021 18:06:25 GMT (envelope-from git) Date: Sat, 31 Jul 2021 18:06:25 GMT Message-Id: <202107311806.16VI6PeP066208@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 1dfb6e5d1f46 - stable/12 - awk: merge fixes to metamode MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 1dfb6e5d1f462af4f4df818ee93766f09f3aa787 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the stable branches of the FreeBSD src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 31 Jul 2021 18:06:26 -0000 The branch stable/12 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=1dfb6e5d1f462af4f4df818ee93766f09f3aa787 commit 1dfb6e5d1f462af4f4df818ee93766f09f3aa787 Author: Warner Losh AuthorDate: 2021-07-31 17:57:21 +0000 Commit: Warner Losh CommitDate: 2021-07-31 18:05:34 +0000 awk: merge fixes to metamode This is a partial MFC of c63c5ab001106/r349062. The whole thing doesn't apply cleanly, but this bit, at least, is needed to fix metamode on stable/12 after the changes to awk were merged from head. Rather than risk breaking other things, I'm just merging the bit I know that's needed. All build tools need to be in DEPENDOBJ so the dependency order is correct and they get built with host tools. Reported by: kp Sponsored by: Netflix --- usr.bin/awk/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/usr.bin/awk/Makefile b/usr.bin/awk/Makefile index d31e811bbec5..82de7d56a415 100644 --- a/usr.bin/awk/Makefile +++ b/usr.bin/awk/Makefile @@ -25,6 +25,7 @@ awkgram.tab.h: awkgram.h proctab.c: maketab ${BTOOLSPATH:U.}/maketab awkgram.h > proctab.c +DEPENDOBJS+= maketab build-tools: maketab maketab: awkgram.tab.h maketab.c ${BUILD_TOOLS_META}