* 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, 115 insertions, 0 deletions

diff --git a/mk/compiler.mk b/mk/compiler.mk
new file mode 100644
index 00000000000..0cca7d81aaf
--- /dev/null
+++ b/mk/compiler.mk
@@ -0,0 +1,115 @@
+# $NetBSD: compiler.mk,v 1.26 2004/02/18 13:32:38 jlam Exp $
+#
+# This Makefile fragment implements handling for supported C/C++/Fortran
+# compilers.
+#
+# The following variables are used by this file:
+#
+# PKGSRC_COMPILER
+#	A list of values specifying the chain of compilers to be used by
+#	pkgsrc to build packages.
+#
+#	Valid values are:
+#		distcc		distributed C/C++ (chainable)
+#		ccache		compiler cache (chainable)
+#		gcc		GNU
+#		mipspro		Silicon Graphics, Inc. MIPSpro (n32/n64)
+#		mipspro-ucode	Silicon Graphics, Inc. MIPSpro (o32)
+#		sunpro		Sun Microsystems, Inc. WorkShip/Forte/Sun
+#				ONE Studio
+#
+#	The default is "gcc".  You can use ccache and/or distcc with an
+#	appropriate PKGSRC_COMPILER setting, e.g. "ccache distcc gcc".
+#	The chain should always end in a real compiler.  This should only
+#	be set in /etc/mk.conf.
+#
+# GCC_REQD
+#	A list of version numbers used to determine the minimum
+#	version of GCC required by a package.  This value should only
+#	be appended to by a package Makefile.
+#
+#	NOTE: Be conservative when setting GCC_REQD, as lang/gcc3 is
+#	known not to build on some platforms, e.g. Darwin.  If gcc3 is
+#	required, set GCC_REQD=3.0 so that we do not try to pull in
+#	lang/gcc3 unnecessarily and have it fail.
+#
+# USE_PKGSRC_GCC
+#	Force using the appropriate version of GCC from pkgsrc based on
+#	GCC_REQD instead of the native compiler.
+#
+# USE_GCC_SHLIB
+#	Indicates that a package uses GCC shared libraries, so we
+#	register a runtime dependency on the compiler package.
+#
+# USE_LANGUAGES
+#	Lists the languages used in the source code of the package,
+#	and is used to determine the correct compilers to install.
+#	Valid values are: c, c++, fortran, java, objc.  The default
+#	is "c".
+#
+# The following variables are defined, and available for testing in
+# package Makefiles:
+#
+# CC_VERSION
+#	The compiler and version being used, e.g.,
+#
+#	.include "../../mk/bsd.prefs.mk"
+#
+#	.if !empty(CC_VERSION:Mgcc-3*)
+#	...
+#	.endif
+#
+# The following variables are deprecated:
+#
+# USE_GCC2, USE_GCC3, USE_SUNPRO, USE_MIPSPRO
+
+.if !defined(BSD_COMPILER_MK)
+BSD_COMPILER_MK=	defined
+
+.include "../../mk/bsd.prefs.mk"
+
+# XXX Add this gross and completely inaccurate hack.  Packages that
+# XXX set USE_GCC_SHLIB should be adjusted to set USE_LANGUAGES
+# XXX correctly (most likely by saying it needs either "c++" or
+# XXX "c c++").  This is here for now so that ~85 packages won't
+# XXX suddenly break.
+#
+.if defined(USE_GCC_SHLIB)
+USE_LANGUAGES?=	c c++
+.endif
+
+# By default, assume that the package requires a C compiler.
+USE_LANGUAGES?=	c
+
+# Support some deprecated variables for a while.  They'll be removed
+# after the pkgsrc-2004Q1 branch is cut.
+#
+.if defined(USE_GCC2)
+GCC_REQD+=		2.8.0
+PKGSRC_COMPILER?=	gcc
+.elif defined(USE_GCC3)
+GCC_REQD+=		3.0
+PKGSRC_COMPILER?=	gcc
+.elif defined(USE_PKGSRC_GCC)
+_USE_PKGSRC_GCC=	yes
+PKGSRC_COMPILER?=	gcc
+.elif defined(USE_SUNPRO)
+PKGSRC_COMPILER?=	sunpro
+.elif defined(USE_MIPSPRO)
+PKGSRC_COMPILER?=	mipspro
+.else
+PKGSRC_COMPILER?=	gcc
+.endif
+
+_PKGSRC_COMPILER=	# empty
+.for _compiler_ in ${PKGSRC_COMPILER}
+.  if empty(_PKGSRC_COMPILER:M${_compiler_})
+_PKGSRC_COMPILER:=	${_compiler_} ${_PKGSRC_COMPILER}
+.  endif
+.endfor
+
+.for _compiler_ in ${_PKGSRC_COMPILER}
+.  include "../../mk/compiler/${_compiler_}.mk"
+.endfor
+
+.endif	# BSD_COMPILER_MK