From 4292fecc2eac408172e79b8a6e0aedfb2c4a19f7 Mon Sep 17 00:00:00 2001
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Tue, 23 Apr 2013 00:26:55 +0000
Subject: - Add WITH_CCACHE_BUILD support during 'configure' phase - Add
 CCACHE_DIR   The MAKE_ENV/CONFIGURE_ENV+= method of adding CCACHE_DIR   in
 /etc/make.conf does not work for many ports since they   overwrite using =
 instead of appending with +=. By adding   CCACHE_DIR into the ENV variables
 after reading in the port   the directory is properly set in the environment.
 Without   this, the ccache support would sometimes work but incorrectly   not
 respect the set CCACHE_DIR, potentially using 2 caches.

With hat:	portmgr
---
 Mk/bsd.port.mk | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'Mk')

diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 523290045460..e315b1e1231a 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -940,6 +940,8 @@ FreeBSD_MAINTAINER=	portmgr@FreeBSD.org
 #
 # WITH_CCACHE_BUILD
 # 				- Enable CCACHE support (devel/ccache).  User settable.
+# CCACHE_DIR
+# 				- Which directory to use for ccache (default: $HOME/.ccache)
 # NO_CCACHE
 #				- Disable CCACHE support for example for certain ports if
 #				  CCACHE is enabled.  User settable.
@@ -2245,7 +2247,12 @@ BUILD_DEPENDS+=		${LOCALBASE}/bin/ccache:${PORTSDIR}/devel/ccache
 .	endif
 
 # Prepend the ccache dir into the PATH and setup ccache env
-MAKE_ENV+=	PATH=${LOCALBASE}/libexec/ccache:${PATH}
+MAKE_ENV+=		PATH=${LOCALBASE}/libexec/ccache:${PATH}
+CONFIGURE_ENV+=	PATH=${LOCALBASE}/libexec/ccache:${PATH}
+.	if defined(CCACHE_DIR)
+MAKE_ENV+=		CCACHE_DIR="${CCACHE_DIR}"
+CONFIGURE_ENV+=	CCACHE_DIR="${CCACHE_DIR}"
+.	endif
 .endif
 
 PTHREAD_CFLAGS?=
-- 
cgit v1.2.3