From nobody Sun Apr 23 01:16:34 2023 X-Original-To: dev-commits-src-main@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 4Q3r2C0QTRz46bMv; Sun, 23 Apr 2023 01:16:35 +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 4Q3r2B6bzHz45D5; Sun, 23 Apr 2023 01:16:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682212594; 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=FtQoTbMPrVcnzNdg3EYqR20ZS7m/Ug1FTxxEZA2Ypkc=; b=F+Uoqz02DAmVMA6JgsPsh7uE6rkX5abFhif5KDuvA38EbOBBCkCqK0gQZeTTYHXqs1rAAb njPNW/aQPdiU2OjhwlRUR/0xHoxKSQfb6P2Xd30/T28F3uuO65ZRkroYBP72dLIXFC5qJF UTfgUzgjL1YhzZaej7CTaJUwxRcBGgUVob0mG44BUlqDeeo0WctCuMNOGxJkNYvQ2+oQgx 1oueJ4OKrBttL0IfBs7S3nQtDTBi4KPAQDdUEp3uX7Qd6muqTGxZvCzpMTKHlFEdA8QqMJ QrnRDnFfO1+p6bvGPx+YxbGx9cu+4jjQQaIdpQfJan5gC9MPexUNbo3JxXXGFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682212594; 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=FtQoTbMPrVcnzNdg3EYqR20ZS7m/Ug1FTxxEZA2Ypkc=; b=wDdpONe5oM7TJujmE0svqUvxgtOOGCQr5psqwgRhYVR+T+TnzDKraJagmLrAp7JmtSXn3y T2kaH9+Xe0TobOobMmPXuPsZERlWEUh1pPZfSeZKWgEMhShmhonXlXABRDEe9uYLkYJV3U P4A2gu7Det8wtspQx4jiRBZUxtFKG0FQ4inKf/CEzLkmBwipk9SZGmctxL9wEJB1xxlkGB 5D+7aIQKqWNyX3LN3S0TYahidiAIi1n73gI6vdSoPgzF46evx5eQEYOCBl0CfAwhNAmywk mEtD76SwEW+TlhZ9moEaReUz5EPj/BD3v3wapuMGaJ2V7NLp/gWVEBbNpy06/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682212594; a=rsa-sha256; cv=none; b=y0esLfwHB1cx6iRu1zTpsozAdDxw61qIOFLDpubj3MEJxlXMOcyAaqhOWVxLPtzB/K/GA7 ZiwJdLlBOTlEpHEj69icX81uNO6G8oFrMRIwSsi4oBh5j0qtjhJLDMJMkZ8GWZC172r5TD RQfGEBQufy2jNHow+ulMznv2QMuisJYpPT32b9T+4H+teABQqjoKc50YL3wlhI1NHySqI8 wmxL9DTri6gJZmZFgBwsBoqntbUE4j9PQAli+VOVLBpFvq89JfohiDIVngGhW+hsyhjL+O FuUrIfNkdTuMoVvjMWJH06a6jz92U3Cv/+OQCQyutY+C5hBLu8UWkTNZv8Dtqg== 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 4Q3r2B5hCMzNqF; Sun, 23 Apr 2023 01:16:34 +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 33N1GYmb076719; Sun, 23 Apr 2023 01:16:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33N1GYYV076718; Sun, 23 Apr 2023 01:16:34 GMT (envelope-from git) Date: Sun, 23 Apr 2023 01:16:34 GMT Message-Id: <202304230116.33N1GYYV076718@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: 04989ef426f9 - main - bmake 20230123 gives us .SYSPATH List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 04989ef426f911e0d7f674f66a080a0af3376b1d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=04989ef426f911e0d7f674f66a080a0af3376b1d commit 04989ef426f911e0d7f674f66a080a0af3376b1d Author: Simon J. Gerraty AuthorDate: 2023-04-23 01:15:31 +0000 Commit: Simon J. Gerraty CommitDate: 2023-04-23 01:15:31 +0000 bmake 20230123 gives us .SYSPATH No need to faff about trying to work out where bmake is looking - it tells you. --- share/mk/bsd.symver.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/share/mk/bsd.symver.mk b/share/mk/bsd.symver.mk index a7bffad5ceae..1969097b7089 100644 --- a/share/mk/bsd.symver.mk +++ b/share/mk/bsd.symver.mk @@ -14,6 +14,9 @@ VERSION_MAP?= Version.map CLEANFILES+= ${VERSION_MAP} +.if ${MAKE_VERSION} >= 20230123 +_mpath= ${.SYSPATH} +.else # Compute the make's -m path. _mpath= _oarg= @@ -24,6 +27,7 @@ _mpath+= ${_arg} _oarg= ${_arg} .endfor _mpath+= /usr/share/mk +.endif # Look up ${VERSION_GEN} in ${_mpath}. _vgen=