[pkgsrc/trunk]: pkgsrc/mk/compiler Extend the list of packages that ccache.mk...

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0c620f9489eb
branches:  trunk
changeset: 648838:0c620f9489eb
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Fri Mar 20 17:53:14 2015 +0000

description:
Extend the list of packages that ccache.mk avoids in order to prevent
circular dependency errors on platforms where most builtins are provided
by pkgsrc.

diffstat:

 mk/compiler/ccache.mk |  21 +++++++++++++++++++--
 1 files changed, 19 insertions(+), 2 deletions(-)

diffs (35 lines):

diff -r a0b0135fbb4e -r 0c620f9489eb mk/compiler/ccache.mk
--- a/mk/compiler/ccache.mk     Fri Mar 20 16:34:35 2015 +0000
+++ b/mk/compiler/ccache.mk     Fri Mar 20 17:53:14 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ccache.mk,v 1.34 2013/05/09 23:37:25 riastradh Exp $
+# $NetBSD: ccache.mk,v 1.35 2015/03/20 17:53:14 tnn Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -70,7 +70,24 @@
 
 _USE_CCACHE=   yes
 
-.if ${CCACHE_BASE} == ${LOCALBASE} && (${PKGPATH} == "devel/ccache" || ${PKGPATH} == "devel/patch" || ${PKGPATH} == "pkgtools/digest")
+# List of packages that ccache may directly or indirectly depend upon,
+# and thus cannot inversely depend on ccache.
+_CCACHE_CIRCULAR_DEPENDENCY_PACKAGES=  \
+       archivers/gzip                  \
+       devel/ccache                    \
+       devel/distcc                    \
+       devel/libtool-base              \
+       devel/nbpatch                   \
+       devel/zlib                      \
+       net/tnftp                       \
+       pkgtools/cwrappers              \
+       pkgtools/digest                 \
+       pkgtools/pkg_install-info       \
+       sysutils/checkperms
+
+# break circular dependencies
+.if ${CCACHE_BASE} == ${LOCALBASE} &&  \
+       !empty(_CCACHE_CIRCULAR_DEPENDENCY_PACKAGES:M${PKGPATH})
 _USE_CCACHE=   no
 MAKEFLAGS+=    _USE_CCACHE=${_USE_CCACHE}
 .endif