From owner-svn-ports-branches@freebsd.org  Sun Feb 25 03:32:42 2018
Return-Path: <owner-svn-ports-branches@freebsd.org>
Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 51190F38D84;
 Sun, 25 Feb 2018 03:32:42 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 03B2E869E8;
 Sun, 25 Feb 2018 03:32:42 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F2D352F1D5;
 Sun, 25 Feb 2018 03:32:41 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1P3Wf1b002653;
 Sun, 25 Feb 2018 03:32:41 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1P3WfRn002652;
 Sun, 25 Feb 2018 03:32:41 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201802250332.w1P3WfRn002652@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Sun, 25 Feb 2018 03:32:41 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r462895 - branches/2018Q1/Mk
X-SVN-Group: ports-branches
X-SVN-Commit-Author: bdrewery
X-SVN-Commit-Paths: branches/2018Q1/Mk
X-SVN-Commit-Revision: 462895
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
 <svn-ports-branches.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 25 Feb 2018 03:32:42 -0000

Author: bdrewery
Date: Sun Feb 25 03:32:41 2018
New Revision: 462895
URL: https://svnweb.freebsd.org/changeset/ports/462895

Log:
  MFH: r462894
  
  WITH_CCACHE_BUILD: Fix some ports not using proper CCACHE_DIR.
  
  Some ports will truncate CCACHE_DIR from the env and due to HOME=${WRKDIR}
  will incorrectly use ${WRKDIR}/.ccache.  Symlink to the proper place.
  
  Approved by:	portmgr (implicit)

Modified:
  branches/2018Q1/Mk/bsd.ccache.mk
Directory Properties:
  branches/2018Q1/   (props changed)

Modified: branches/2018Q1/Mk/bsd.ccache.mk
==============================================================================
--- branches/2018Q1/Mk/bsd.ccache.mk	Sun Feb 25 03:32:18 2018	(r462894)
+++ branches/2018Q1/Mk/bsd.ccache.mk	Sun Feb 25 03:32:41 2018	(r462895)
@@ -51,6 +51,13 @@ MAKE_ENV+=		CCACHE_DIR="${CCACHE_DIR}"
 CONFIGURE_ENV+=	CCACHE_DIR="${CCACHE_DIR}"
 .	endif
 .endif
+
+# Some ports will truncate CCACHE_DIR from the env and due to HOME=${WRKDIR}
+# will incorrectly use ${WRKDIR}/.ccache.  Symlink to the proper place.
+${WRKDIR}/.ccache: ${WRKDIR}
+	@${LN} -sf ${CCACHE_DIR} ${WRKDIR}/.ccache
+ccache-wrkdir-link: ${WRKDIR}/.ccache .PHONY
+post-extract: ccache-wrkdir-link
 .endif
 
 .endif