diff options
| author | jperkin <jperkin@pkgsrc.org> | 2015-04-29 14:23:23 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2015-04-29 14:23:23 +0000 |
| commit | a2de36f2cd60799556a741533985d0215f4cdaed (patch) | |
| tree | d2888097deec89d2d8b8b5dd4187ce41abc3b26b /mk | |
| parent | 13d147025c9bb1e979961d6075efedaa14f69e93 (diff) | |
| download | pkgsrc-a2de36f2cd60799556a741533985d0215f4cdaed.tar.gz | |
Introduce _USE_CWRAPPERS logic to ensure consistency, USE_CWRAPPERS could
differ between a package and user setting, resulting in incorrect WRAPPER_*
values being set from wrapper-defs.mk.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 4 | ||||
| -rw-r--r-- | mk/bsd.prefs.mk | 9 | ||||
| -rw-r--r-- | mk/wrapper/wrapper-defs.mk | 4 |
3 files changed, 12 insertions, 5 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 16cd59fe2e2..bd9944ead1a 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.2012 2015/04/27 19:59:07 jperkin Exp $ +# $NetBSD: bsd.pkg.mk,v 1.2013 2015/04/29 14:23:23 jperkin Exp $ # # This file is in the public domain. # @@ -407,7 +407,7 @@ ${FAKEHOMEDIR}: ${RUN} ${MKDIR} ${.TARGET} # Use C-based wrappers or legacy shell versions. -.if ${USE_CWRAPPERS:tl} != "no" +.if ${_USE_CWRAPPERS} == "yes" .include "cwrappers.mk" .else .include "wrapper/bsd.wrapper.mk" diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index c70f7ce8a9b..c5e45f2899e 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.363 2015/04/27 10:33:49 tnn Exp $ +# $NetBSD: bsd.prefs.mk,v 1.364 2015/04/29 14:23:23 jperkin Exp $ # # This file includes the mk.conf file, which contains the user settings. # @@ -799,6 +799,13 @@ PREPEND_PATH+= ${LOCALBASE}/bin INIT_SYSTEM?= rc.d _BUILD_DEFS+= INIT_SYSTEM +# Enable cwrappers if requested unless we're building the wrappers themselves. +.if ${USE_CWRAPPERS:tl} != "no" && empty(PKGPATH:Mpkgtools/cwrappers) +_USE_CWRAPPERS= yes +.else +_USE_CWRAPPERS= no +.endif + # Wrapper framework definitions .include "wrapper/wrapper-defs.mk" diff --git a/mk/wrapper/wrapper-defs.mk b/mk/wrapper/wrapper-defs.mk index d6de5c7477a..36abf2b7292 100644 --- a/mk/wrapper/wrapper-defs.mk +++ b/mk/wrapper/wrapper-defs.mk @@ -1,4 +1,4 @@ -# $NetBSD: wrapper-defs.mk,v 1.4 2015/04/28 21:15:01 jperkin Exp $ +# $NetBSD: wrapper-defs.mk,v 1.5 2015/04/29 14:23:23 jperkin Exp $ # # Copyright (c) 2004 The NetBSD Foundation, Inc. # All rights reserved. @@ -37,7 +37,7 @@ .if !defined(WRAPPER_DEFS_MK) WRAPPER_DEFS_MK= defined -.if ${USE_CWRAPPERS:tl} != "no" +.if ${_USE_CWRAPPERS} == "yes" WRAPPER_DIR= ${WRKDIR}/.cwrapper WRAPPER_BINDIR= ${WRAPPER_DIR}/bin .else |