Date: Sun, 22 Mar 2015 19:41:45 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r381950 - head/Mk Message-ID: <201503221941.t2MJfjaj075818@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Sun Mar 22 19:41:44 2015 New Revision: 381950 URL: https://svnweb.freebsd.org/changeset/ports/381950 QAT: https://qat.redports.org/buildarchive/r381950/ Log: Unbreak ccache after r359201 set HOME in MAKE_ENV/CONFIGURE_ENV rather than in the global scope as bsd.ccache.mk expected. This was causing ccache to use WKRDIR/.ccache for obj caching. 'make clean' would then lose all cached files. This worked in in Poudriere though as CCACHE_DIR is explicitly defined. With hat: portmgr Modified: head/Mk/bsd.ccache.mk Modified: head/Mk/bsd.ccache.mk ============================================================================== --- head/Mk/bsd.ccache.mk Sun Mar 22 19:33:08 2015 (r381949) +++ head/Mk/bsd.ccache.mk Sun Mar 22 19:41:44 2015 (r381950) @@ -6,10 +6,8 @@ COMMANDS_Include_MAINTAINER= portmgr@Fre _CCACHEMKINCLUDED= yes -# Try to set a default CCACHE_DIR to workaround HOME=/dev/null and -# HOME=${WRKDIR}/* staging fixes -.if defined(WITH_CCACHE_BUILD) && !defined(CCACHE_DIR) && \ - (!defined(HOME) || ${HOME} == /dev/null || ${HOME:S/^${WRKDIR}//} != ${HOME}) +# 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503221941.t2MJfjaj075818>