svn commit: r400957 - head/Mk/Scripts

Bryan Drewery bdrewery at FreeBSD.org
Fri Nov 6 20:18:37 UTC 2015


Author: bdrewery
Date: Fri Nov  6 20:18:35 2015
New Revision: 400957
URL: https://svnweb.freebsd.org/changeset/ports/400957

Log:
  Don't hardcode CCACHE_DIR.
  
  PR:		199509
  Submitted by:	ngie (based on)
  Sponsored by:	EMC / Isilon Storage Division
  With hat:	portmgr

Modified:
  head/Mk/Scripts/check_leftovers.sh

Modified: head/Mk/Scripts/check_leftovers.sh
==============================================================================
--- head/Mk/Scripts/check_leftovers.sh	Fri Nov  6 20:14:00 2015	(r400956)
+++ head/Mk/Scripts/check_leftovers.sh	Fri Nov  6 20:18:35 2015	(r400957)
@@ -40,6 +40,9 @@ if [ -n "${LOCALBASE}" ]; then
 else
 	LOCALBASE=$(make -C ${portdir} -VLOCALBASE)
 fi
+if [ -z "${CCACHE_DIR}" ]; then
+	CCACHE_DIR=$(make -C ${portdir} -VCCACHE_DIR)
+fi
 homedirs=$(awk -F: -v users=$(make -C ${portdir} -V USERS|sed -e 's, ,|,g;/^$/d;s,^,^(,;s,$,)$,') 'users && $1 ~ users {print $9}' ${PORTSDIR}/UIDs|sort -u|sed -e "s|/usr/local|${PREFIX}|"|tr "\n" " ")
 plistsub_sed=$(make -C ${portdir} -VPLIST_SUB_SED | /bin/sh ${PORTSDIR}/Mk/Scripts/plist_sub_sed_sort.sh)
 tmpplist=$(make -C ${portdir} -VTMPPLIST)
@@ -47,7 +50,7 @@ tmpplist=$(make -C ${portdir} -VTMPPLIST
 while read modtype path extra; do
 	# Ignore everything from these files/directories
 	case "${path}" in
-		${HOME:-/root}/.ccache/*|/root/.ccache/*|\
+		${CCACHE_DIR}/*|\
 		/compat/linux/proc/*|\
 		/dev/*|\
 		/etc/make.conf.bak|\


More information about the svn-ports-all mailing list