diff options
| author | jlam <jlam> | 2004-02-05 03:37:47 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2004-02-05 03:37:47 +0000 |
| commit | c8b119fd66aacc748747d0da23cbc4eae885c8dc (patch) | |
| tree | 63c95ead370135a22f52871833bd628fc5529650 /mk | |
| parent | 4011a6ba7ae6bef66e0a6484f99fa427c1515ec4 (diff) | |
| download | pkgsrc-c8b119fd66aacc748747d0da23cbc4eae885c8dc.tar.gz | |
Include bsd.compiler.mk inside both bsd.pkg.mk and bsd.prefs.mk and define
a stack-like mechanism in bsd.prefs.mk to detect when a we're inside
bsd.prefs.mk.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 8 | ||||
| -rw-r--r-- | mk/bsd.prefs.mk | 10 |
2 files changed, 15 insertions, 3 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 609cd01e64c..57497928e04 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1369 2004/02/02 11:34:17 jlam Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1370 2004/02/05 03:37:47 jlam Exp $ # # This file is in the public domain. # @@ -1319,10 +1319,14 @@ SCRIPTS_ENV+= CURDIR=${.CURDIR} DISTDIR=${DISTDIR} \ SCRIPTS_ENV+= BATCH=yes .endif +# Get the proper dependencies and set the PATH to use the compiler +# named in PKGSRC_COMPILER. +# +.include "../../mk/compiler/bsd.compiler.mk" + .if !empty(USE_BUILDLINK2:M[nN][oO]) && !empty(USE_BUILDLINK3:M[nN][oO]) NO_BUILDLINK= # defined .endif - .if !defined(NO_BUILDLINK) . if empty(USE_BUILDLINK3:M[nN][oO]) . include "../../mk/buildlink3/bsd.buildlink3.mk" diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index ef1b0e5708a..6fef0239571 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.146 2004/02/01 00:32:38 jlam Exp $ +# $NetBSD: bsd.prefs.mk,v 1.147 2004/02/05 03:37:47 jlam Exp $ # # Make file, included to get the site preferences, if any. Should # only be included by package Makefiles before any .if defined() @@ -6,6 +6,11 @@ # 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:M+*), 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 @@ -463,6 +468,7 @@ 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) @@ -470,3 +476,5 @@ WRKLOG?= ${WRKDIR}/.work.log .endif .endif # BSD_PKG_MK + +BSD_PREFS_MK:= ${BSD_PREFS_MK:S/+$//} |