diff options
| author | jlam <jlam> | 2004-02-18 13:32:38 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2004-02-18 13:32:38 +0000 |
| commit | 920811ba4244705fdca01b1f2e99c9104cf6ec5f (patch) | |
| tree | 4a6b9245550fffa4e5469f8b4f800859f0b85289 /mk/bsd.prefs.mk | |
| parent | 31337aba14dfc5b78db1d67408752dc6b4a71420 (diff) | |
| download | pkgsrc-920811ba4244705fdca01b1f2e99c9104cf6ec5f.tar.gz | |
* 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.
Diffstat (limited to 'mk/bsd.prefs.mk')
| -rw-r--r-- | mk/bsd.prefs.mk | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index f9f40839203..47e61fa57c8 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.154 2004/02/14 11:28:28 jlam Exp $ +# $NetBSD: bsd.prefs.mk,v 1.155 2004/02/18 13:32:38 jlam Exp $ # # Make file, included to get the site preferences, if any. Should # only be included by package Makefiles before any .if defined() @@ -6,11 +6,6 @@ # to make sure any variables defined in /etc/mk.conf, $MAKECONF, or # the system defaults (sys.mk and bsd.own.mk) are used. -# If empty(BSD_PREFS_MK), then we are _not_ being included from within -# bsd.prefs.mk. -# -BSD_PREFS_MK:= ${BSD_PREFS_MK}+ - # Do not recursively include mk.conf, redefine OPSYS, include bsd.own.mk, etc. .ifndef BSD_PKG_MK @@ -488,13 +483,4 @@ WRKDIR?= ${BUILD_DIR}/${WRKDIR_BASENAME} # WRKLOG?= ${WRKDIR}/.work.log -# Include bsd.compiler.mk for CC_VERSION. -.if exists(${.CURDIR}/../../mk/compiler/bsd.compiler.mk) -. include "../../mk/compiler/bsd.compiler.mk" -.elif exists(${.CURDIR}/../mk/compiler/bsd.compiler.mk) -. include "../mk/compiler/bsd.compiler.mk" -.endif - .endif # BSD_PKG_MK - -BSD_PREFS_MK:= ${BSD_PREFS_MK:S/+$//} |