summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authortnn <tnn@pkgsrc.org>2015-03-20 17:53:14 +0000
committertnn <tnn@pkgsrc.org>2015-03-20 17:53:14 +0000
commitf19d8fbba96f6e4b7ebb040d0e4450ab1976d09b (patch)
treefd0dd547619e9d67b8ee98358de04de45e9f497e /mk
parent93784dfaf3cf12fd141abd1a2510f028ae6417b7 (diff)
downloadpkgsrc-f19d8fbba96f6e4b7ebb040d0e4450ab1976d09b.tar.gz
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 (limited to 'mk')
-rw-r--r--mk/compiler/ccache.mk21
1 files changed, 19 insertions, 2 deletions
diff --git a/mk/compiler/ccache.mk b/mk/compiler/ccache.mk
index 4f8c586742d..e75753957e8 100644
--- a/mk/compiler/ccache.mk
+++ b/mk/compiler/ccache.mk
@@ -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 @@ CCACHE_DIR?= ${WRKDIR}/.ccache-cache
_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