From owner-svn-ports-head@FreeBSD.ORG  Sun Mar 22 19:41:45 2015
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id BFED318A;
 Sun, 22 Mar 2015 19:41:45 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id ABA70BF9;
 Sun, 22 Mar 2015 19:41:45 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2MJfjaE075819;
 Sun, 22 Mar 2015 19:41:45 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2MJfjaj075818;
 Sun, 22 Mar 2015 19:41:45 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201503221941.t2MJfjaj075818@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Sun, 22 Mar 2015 19:41:45 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r381950 - head/Mk
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 22 Mar 2015 19:41:45 -0000

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