From nobody Wed Dec 21 16:34:35 2022 X-Original-To: dev-commits-ports-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 4NcfDC4s6mz1G8vL; Wed, 21 Dec 2022 16:34: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 4NcfDC4Hl1z3Qnx; Wed, 21 Dec 2022 16:34:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671640475; 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=CbFmhhIH7uTNVsej+wNwNwJ/isY4Yg4xYCxdZ8iVeI4=; b=BqH1KXMbpQax7q582AvoNtxqPu+rSfpIndiyUd8eNH4JVC8+9fvtnQ3d4c6RCvAjS1J+IM geTn0PEEzHMcvhrAsHI0s+jD67OBVgfr124tHTQjbPiPYx7v5z4sWd7bNI97oyhdYZxGfx pfC3kUuj3fBEuLdj73vJFPkXmOemeLSBWli0MBmgxeTj53ipzFjie9tpJnWdqbfUnOVL// V7igBJaaoYBdzmkpueuQdN3kfdLZT1sV1JKWl3YLUSKaRm8aFXYLlldRAsOs78SLY8tElt p5B1Tlg/t0LPMrW/algDszyI/z8GuHtzyH8p6Hl7wUYTGJXATJ0gIYacaFKhmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671640475; 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=CbFmhhIH7uTNVsej+wNwNwJ/isY4Yg4xYCxdZ8iVeI4=; b=hIJBtvly4QdRr7BjKn5LZnO99m3sp9P/igYLjTxLeh6u52J31cLtxQ502Av++TKG4aSXer pWADPXQ786lmgzLStHSRW9mr/PfLhRElDwLaSWpQZp6VpgndUjB7rrzXBeH2D787KiM34i hoRpnc2TwoPLorRH7o8isGD+ndnOJVWWsA8c+4KGDF2WUfJurrkb8FrYWKQ1cRSgeVMgGT bEspdtPEfN6hMo/00aeB2gMD9iEX9vOLpxU6+tcL01dp6L++PtJs1bDWjJWqyBgRGm7LGi 2XPjnNLJu7UN+MzVp4syarT/v7k9uimrd3kx+gUI7hENV9mz6LKFfjUzu+G9/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671640475; a=rsa-sha256; cv=none; b=sDdytQRCxUohLM5QKlvMsg2jeiZDVrPeQpQTJ0qZW0pmRD5W8LU8CYSWCmThng+Ji6n0pe 3uby6Uk3R/7YlZ8A8t5z6OtORvrqNVsuvhPnSWaVM/sUMBu/bjI0Nb0TZyNwoh2xTuNx8e IlnzcMYiQzn1DCiO9TsFqW0zibWb4R2LCThk6T+zJGe30+381DyZUSaYRu95flDH9M+Kw/ UDtVRqw+GPJJD+sLGMGK8sUytjlcTROTGVFSPLttTBVWqxNrhZmrUGRzftM9VNItF1RUzc 21haTpS7muWXp+6wYA64scHdV3Co2ReQKVC/+tKNQb+yqoOM64e+6JKu0khQsw== 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 4NcfDC3LZwzMZH; Wed, 21 Dec 2022 16:34:35 +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 2BLGYZEY097512; Wed, 21 Dec 2022 16:34:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BLGYZUw097511; Wed, 21 Dec 2022 16:34:35 GMT (envelope-from git) Date: Wed, 21 Dec 2022 16:34:35 GMT Message-Id: <202212211634.2BLGYZUw097511@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Bryan Drewery Subject: git: 4ca11c4efc7e - main - Mk/bsd.sanity.mk: Reduce parsing during package builds List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bdrewery X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4ca11c4efc7e01e8fbf797624c8d54157f1c61a0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bdrewery: URL: https://cgit.FreeBSD.org/ports/commit/?id=4ca11c4efc7e01e8fbf797624c8d54157f1c61a0 commit 4ca11c4efc7e01e8fbf797624c8d54157f1c61a0 Author: Bryan Drewery AuthorDate: 2022-12-21 16:12:45 +0000 Commit: Bryan Drewery CommitDate: 2022-12-21 16:34:32 +0000 Mk/bsd.sanity.mk: Reduce parsing during package builds This disables bsd.sanity.mk when PACKAGE_BUILDING is set such that it only is loaded during 'make [all]' or 'make check-sanity'. It is assumed the package tool will manually call the target if it wants the check. Otherwise we get redundant logic and filesystem lookups from this file for every other build target. Prodded by: mjg --- Mk/bsd.port.mk | 3 +++ Mk/bsd.sanity.mk | 3 +++ 2 files changed, 6 insertions(+) diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 457497a17e8a..4bd5681bc61c 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1961,7 +1961,10 @@ ERROR+= "Unknown USES=${f:C/\:.*//}" . endfor . if defined(PORTNAME) +. if !defined(PACKAGE_BUILDING) || empty(.TARGETS) || make(all) || \ + make(check-sanity) || make(show*-errors) || make(show*-warnings) .include "${PORTSDIR}/Mk/bsd.sanity.mk" +. endif . endif . if defined(USE_LOCALE) diff --git a/Mk/bsd.sanity.mk b/Mk/bsd.sanity.mk index ac76013ef80b..621445045470 100644 --- a/Mk/bsd.sanity.mk +++ b/Mk/bsd.sanity.mk @@ -55,6 +55,7 @@ ERROR+= "${a} is unsupported, please use ${${a}_ALT}" # Warnings only when DEVELOPER=yes +.if defined(DEVELOPER) .if exists(${.CURDIR}/../../Mk/bsd.port.mk) || ${OVERLAYS:tA:M${.CURDIR:H:H}} == ${.CURDIR:H:H} . if ${.CURDIR:H:T} != ${PKGCATEGORY} @@ -311,3 +312,5 @@ DEV_WARNING+= "${a} is not needed: ${${a}_REASON}" DEV_ERROR+= "${a} is unsupported, please use ${${a}_ALT}" . endif .endfor + +.endif # defined(DEVELOPER)