diff options
| author | tnn <tnn> | 2015-03-20 17:53:14 +0000 |
|---|---|---|
| committer | tnn <tnn> | 2015-03-20 17:53:14 +0000 |
| commit | 01a8d3d7ab4443836f14815508a93f168b3e51cb (patch) | |
| tree | fd0dd547619e9d67b8ee98358de04de45e9f497e /mk/compiler | |
| parent | 914bdb8ade7d355e30f9fd0e36c63fd5d18824b3 (diff) | |
| download | pkgsrc-01a8d3d7ab4443836f14815508a93f168b3e51cb.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/compiler')
| -rw-r--r-- | mk/compiler/ccache.mk | 21 |
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 |