* Move pkgsrc/mk/compiler/bsd.compiler.mk to pkgsrc/mk/compiler.mk.

  Package Makefiles may now directly include compiler.mk.

* Don't include compiler.mk within bsd.prefs.mk any longer.  It was only
  included for the purposes of defining CC_VERSION.  Packages that want
  to test the value of CC_VERSION should now first include
  "../../mk/compiler.mk".  Any GCC_REQD statements in package Makefiles
  should be set before compiler.mk is included.

* Simpllfy pkgsrc/mk/compiler/*.mk files as a result of not needing to
  be included indirectly by bsd.prefs.mk.  We remove the special handling
  associated with detecting whether the file was included from within
  bsd.prefs.mk.  These files are now much more straightforward to write
  and understand.

* G/C the BSD_PREFS_MK stack mechanism as the only users (compiler/*)
  no longer need it.

* Ensure that directories are prepended to the PATH only from within
  bsd.pkg.mk.

1 files changed, 29 insertions, 40 deletions

diff --git a/mk/compiler/ccache.mk b/mk/compiler/ccache.mk
index c8595701653..437870d7b2b 100644
--- a/mk/compiler/ccache.mk
+++ b/mk/compiler/ccache.mk
@@ -1,16 +1,18 @@
-# $NetBSD: ccache.mk,v 1.14 2004/02/12 08:54:48 jlam Exp $
+# $NetBSD: ccache.mk,v 1.15 2004/02/18 13:32:38 jlam Exp $
 
 .if !defined(COMPILER_CCACHE_MK)
-COMPILER_CCACHE_MK=	one
+COMPILER_CCACHE_MK=	defined
 
-.  if !empty(PKGPATH:Mdevel/ccache)
+.include "../../mk/bsd.prefs.mk"
+
+.if !empty(PKGPATH:Mdevel/ccache)
 IGNORE_CCACHE=	yes
 MAKEFLAGS+=	IGNORE_CCACHE=yes
-.  endif
+.endif
 
-.  if defined(IGNORE_CCACHE)
+.if defined(IGNORE_CCACHE)
 _USE_CCACHE=	NO
-.  endif
+.endif
 
 # LANGUAGES.<compiler> is the list of supported languages by the compiler.
 # _LANGUAGES.<compiler> is ${LANGUAGES.<compiler>} restricted to the ones
@@ -18,56 +20,43 @@ _USE_CCACHE=	NO
 # 
 LANGUAGES.ccache=	c c++
 _LANGUAGES.ccache=	# empty
-.  for _lang_ in ${USE_LANGUAGES}
+.for _lang_ in ${USE_LANGUAGES}
 _LANGUAGES.ccache+=	${LANGUAGES.ccache:M${_lang_}}
-.  endfor
-.  if empty(_LANGUAGES.ccache)
+.endfor
+.if empty(_LANGUAGES.ccache)
 _USE_CCACHE=	NO
-.  endif
+.endif
 
-.  if !defined(_USE_CCACHE)
+.if !defined(_USE_CCACHE)
 _USE_CCACHE=	YES
-.  endif
+.endif
 
-.  if !empty(_USE_CCACHE:M[yY][eE][sS])
+.if !empty(_USE_CCACHE:M[yY][eE][sS])
 EVAL_PREFIX+=		_CCACHEBASE=ccache
 _CCACHEBASE_DEFAULT=	${LOCALBASE}
 _CCACHEBASE?=		${LOCALBASE}
 
-.    if exists(${_CCACHEBASE}/bin/ccache)
+.  if exists(${_CCACHEBASE}/bin/ccache)
 _CCACHE_DIR=	${WRKDIR}/.ccache
 _CCACHE_LINKS=	# empty
-.      if !empty(_LANGUAGES.ccache:Mc)
+.    if !empty(_LANGUAGES.ccache:Mc)
 _CCACHE_CC:=	${_CCACHE_DIR}/bin/${PKG_CC:T}
 _CCACHE_LINKS+=	_CCACHE_CC
 PKG_CC:=	${_CCACHE_CC}
 CC=		${PKG_CC:T}
-.      endif
-.      if !empty(_LANGUAGES.ccache:Mc++)
+.    endif
+.    if !empty(_LANGUAGES.ccache:Mc++)
 _CCACHE_CXX:=	${_CCACHE_DIR}/bin/${PKG_CXX:T}
 _CCACHE_LINKS+=	_CCACHE_CXX
 PKG_CXX:=	${_CCACHE_CXX}
 CXX=		${PKG_CXX:T}
-.      endif
 .    endif
 .  endif
-.endif	# COMPILER_CCACHE_MK
-
-# The following section is included only if we're not being included by
-# bsd.prefs.mk.
-#
-.if empty(BSD_PREFS_MK)
-.  if empty(COMPILER_CCACHE_MK:Mtwo)
-COMPILER_CCACHE_MK+=	two
 
 # Prepend the path the to the compiler to the PATH
-.    if !empty(_USE_CCACHE:M[yY][eE][sS])
-.      if !empty(_LANGUAGES.ccache)
-.        if empty(PREPEND_PATH:M${_CCACHE_DIR}/bin)
+.  if !empty(_LANGUAGES.ccache)
 PREPEND_PATH+=	${_CCACHE_DIR}/bin
-PATH:=		${_CCACHE_DIR}/bin:${PATH}
-.        endif
-.      endif
+.  endif
 
 # Add the dependency on ccache.
 BUILD_DEPENDS+=	ccache-[0-9]*:../../devel/ccache
@@ -79,17 +68,17 @@ CONFIGURE_ENV+=	CCACHE_HASHCC=${CC_VERSION_STRING:Q}
 MAKE_ENV+=	CCACHE_HASHCC=${CC_VERSION_STRING:Q}
 
 # Create symlinks for the compiler into ${WRKDIR}.
-.      if exists(${_CCACHEBASE}/bin/ccache)
-.        for _target_ in ${_CCACHE_LINKS}
-.          if !target(${${_target_}})
+.  if exists(${_CCACHEBASE}/bin/ccache)
+.    for _target_ in ${_CCACHE_LINKS}
+.      if !target(${${_target_}})
 override-tools: ${${_target_}}
 ${${_target_}}:
 	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
 	${_PKG_SILENT}${_PKG_DEBUG}					\
 	${LN} -fs ${_CCACHEBASE}/bin/ccache ${.TARGET}
-.          endif
-.        endfor
 .      endif
-.    endif
-.  endif # COMPILER_CCACHE_MK
-.endif	 # BSD_PREFS_MK
+.    endfor
+.  endif
+.endif	# _USE_CCACHE == "yes"
+
+.endif	# COMPILER_CCACHE_MK