diff options
| author | tv <tv@pkgsrc.org> | 2005-01-24 18:20:57 +0000 |
|---|---|---|
| committer | tv <tv@pkgsrc.org> | 2005-01-24 18:20:57 +0000 |
| commit | 4284bdc49447c5e39162632abeb26bd43c44c0b2 (patch) | |
| tree | f3688de097c097f29fbc927df8ca2456cd7986c5 /mk/compiler | |
| parent | e1ff8f800e0cdc91f079cb09dc8d0432c6ed4663 (diff) | |
| download | pkgsrc-4284bdc49447c5e39162632abeb26bd43c44c0b2.tar.gz | |
Merge down deferred EVAL_PREFIX handling from tv-derecurse branch.
Also move its definition later in bsd.pkg.mk, so that it actually works
for compiler/*.mk (which is why those files originally had to provide
"defaults" for their variables -- they never did get evaluated).
Diffstat (limited to 'mk/compiler')
| -rw-r--r-- | mk/compiler/ccache.mk | 3 | ||||
| -rw-r--r-- | mk/compiler/distcc.mk | 3 | ||||
| -rw-r--r-- | mk/compiler/f2c.mk | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/mk/compiler/ccache.mk b/mk/compiler/ccache.mk index 613f70d4d3d..2bd70bd6f22 100644 --- a/mk/compiler/ccache.mk +++ b/mk/compiler/ccache.mk @@ -1,4 +1,4 @@ -# $NetBSD: ccache.mk,v 1.25 2005/01/12 22:56:41 jlam Exp $ +# $NetBSD: ccache.mk,v 1.26 2005/01/24 18:20:57 tv Exp $ # # Copyright (c) 2004 The NetBSD Foundation, Inc. # All rights reserved. @@ -69,7 +69,6 @@ _USE_CCACHE= YES .if !empty(_USE_CCACHE:M[yY][eE][sS]) EVAL_PREFIX+= _CCACHEBASE=ccache _CCACHEBASE_DEFAULT= ${LOCALBASE} -_CCACHEBASE?= ${LOCALBASE} _CCACHE_DIR= ${WRKDIR}/.ccache _CCACHE_VARS= # empty diff --git a/mk/compiler/distcc.mk b/mk/compiler/distcc.mk index 998100f9c70..1bdd6b7436a 100644 --- a/mk/compiler/distcc.mk +++ b/mk/compiler/distcc.mk @@ -1,4 +1,4 @@ -# $NetBSD: distcc.mk,v 1.26 2005/01/12 22:56:41 jlam Exp $ +# $NetBSD: distcc.mk,v 1.27 2005/01/24 18:20:57 tv Exp $ # # Copyright (c) 2004 The NetBSD Foundation, Inc. # All rights reserved. @@ -69,7 +69,6 @@ _USE_DISTCC= YES .if !empty(_USE_DISTCC:M[yY][eE][sS]) EVAL_PREFIX+= _DISTCCBASE=distcc _DISTCCBASE_DEFAULT= ${LOCALBASE} -_DISTCCBASE?= ${LOCALBASE} _DISTCC_DIR= ${WRKDIR}/.distcc _DISTCC_VARS= # empty diff --git a/mk/compiler/f2c.mk b/mk/compiler/f2c.mk index 541aca015de..13134219f1e 100644 --- a/mk/compiler/f2c.mk +++ b/mk/compiler/f2c.mk @@ -1,4 +1,4 @@ -# $NetBSD: f2c.mk,v 1.3 2005/01/12 22:56:41 jlam Exp $ +# $NetBSD: f2c.mk,v 1.4 2005/01/24 18:20:57 tv Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -70,7 +70,6 @@ _USE_F2C= YES .if !empty(_USE_F2C:M[yY][eE][sS]) EVAL_PREFIX+= _F2CBASE=f2c _F2CBASE_DEFAULT= ${LOCALBASE} -_F2CBASE?= ${LOCALBASE} _F2C_DIR= ${WRKDIR}/.f2c _F2C_VARS= # empty |