From nobody Mon Sep 12 07:47:56 2022 X-Original-To: dev-commits-ports-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 4MQzGj3J5cz4blnL; Mon, 12 Sep 2022 07:47:57 +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 4MQzGj295yz3RMX; Mon, 12 Sep 2022 07:47:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662968877; 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=mmffod4teUNQaj25bZGQXP9ialpjtahJXTt+2Mmrr24=; b=YuiqU40V4qktHhnr4GfysTx/ZLUkwC6ajOQ6wyzauTZeYMlAQdertXVWSyA6jgpwdD6tGo 6dz16DfXLzhbJYkfq6dK620hym+hegJcnXCxzGYP7s7T3zws916rzu87XPIzDDBqWNe6eN JlVIlohfAdWDoSIa1ySOTtr6MXRc0m9NqdBIHPyqFteBZl2eOGNV3W8bpBJfY0pnFPjMRd r9CBhOgOcN2/vNVH7RCXH2akcfnseRznttgq5nImoEr6Ft+LaPZytW9IpbykHJ1IaBMJwW sYHC/zgHBwlV77aYkg68qjph8ynA26QBAPx7BLtjPy0XUWE/0yeRmiV+HvWwdg== 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 4MQzGj00NHzvcH; Mon, 12 Sep 2022 07:47:57 +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 28C7lu0k019317; Mon, 12 Sep 2022 07:47:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28C7lu3g019316; Mon, 12 Sep 2022 07:47:56 GMT (envelope-from git) Date: Mon, 12 Sep 2022 07:47:56 GMT Message-Id: <202209120747.28C7lu3g019316@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 679b9e2f4367 - main - Mk/bsd.ccache.mk: Add CCACHE_ENABLED variable for ports' convenience List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 679b9e2f43675a36fa552404c770ab620a350fa1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662968877; 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=mmffod4teUNQaj25bZGQXP9ialpjtahJXTt+2Mmrr24=; b=s1Q849Dhd/MuyG8R1N83CY0lZuDV4+R4zNiVZTEfOp5OYXbFQ+TyfJhT1rvRqLZJ79HGr5 BujmBjI8CJNnYu6EE6B9eh8qU/3jDB+ZfxzSpB6Q0d78lNcczLslvwL6r7Uyv4BzOpgona uR3/1Kf3eaxULZIg2Js4NSAHGKImS1jcdO14EtswjkRhGWkwGWh+Rmzd6JPOKL86qVqeSh k4gveOJDc1bMC9VuW7R2u8a9S/Ailar6ASR8qfOiM4e8B9ILy2DwAUwjl+SeVIDZftcxQc E4XKH3qsy8puW8QWyGTD8FsoJp7x/DCk6ME17nggLerNpnxdR8qo3f+ovUYQ7Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662968877; a=rsa-sha256; cv=none; b=Z/ic7kmDk/kRt7AITYualZKSqVsPlm2ltLBUfa962q6oY0CAMa27Njlnc7jz4lJc19lQuT V4H2WMNMheL2sESvjdTzwTsL0wIOuXNnAi5g0EzQcCOOWKUbCAMqzTIa2AI4jZtW5H94Xo VmVnE8ca36SKPURUgZo6K7Pcmm8ZzYV4Ez/+mp90IuRVxExGVy/hw0VahueowjAMLNsfS2 +yeLE5Kea2R20U5FO2F4BICacCfZExD93gsMl994rcW3rpxqStplkAKg/rsxx/BhW8pRDv Sio8w16NCq1J1sD7KCpmSTZwwM1ZAr+WELCen86DgFNVDLljeVBjtJiGg9o1vQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=679b9e2f43675a36fa552404c770ab620a350fa1 commit 679b9e2f43675a36fa552404c770ab620a350fa1 Author: Yuri Victorovich AuthorDate: 2022-09-12 07:41:44 +0000 Commit: Yuri Victorovich CommitDate: 2022-09-12 07:47:54 +0000 Mk/bsd.ccache.mk: Add CCACHE_ENABLED variable for ports' convenience Some projects do some special handling when the ccache program is present. This causes problems because ports framework has its own ccache settings and mere presence of ccache program doesn't mean that ccache is enabled. The new CCACHE_ENABLED variable can be used to tell projects if ccache is really enabled. PR: 266310 Approved by: tcberner@ (as portmgr) --- Mk/bsd.ccache.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Mk/bsd.ccache.mk b/Mk/bsd.ccache.mk index 036d83720f5b..83f225748420 100644 --- a/Mk/bsd.ccache.mk +++ b/Mk/bsd.ccache.mk @@ -11,6 +11,7 @@ # default. # # Port use (users should not modify these): +# - CCACHE_ENABLED - tells the port if ccache is enabled. # - CCACHE_BIN - path to the ccache binary. Intended to be prefixed before CC. # - CCACHE_WRAPPER_PATH - path to directory containing compiler symlinks back # to ccache. For example, gcc5 -> ccache. Intended @@ -42,11 +43,18 @@ _CCACHEMKINCLUDED= yes NO_CCACHE= t . endif +. if defined(WITH_CCACHE_BUILD) +CCACHE_ENABLED= yes +. else +CCACHE_ENABLED= no +. endif + # HOME is always set to ${WRKDIR} now. Try to use /root/.ccache as default. . if defined(WITH_CCACHE_BUILD) && !defined(CCACHE_DIR) . if defined(USER) && ${USER} == root CCACHE_DIR= /root/.ccache . else +CCACHE_ENABLED= no NO_CCACHE= yes WARNING+= WITH_CCACHE_BUILD support disabled, please set CCACHE_DIR. . endif