[pkgsrc/trunk]: pkgsrc/mk Introduce _USE_CWRAPPERS logic to ensure consistenc...

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/752b482739f0
branches:  trunk
changeset: 650961:752b482739f0
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Wed Apr 29 14:23:23 2015 +0000

description:
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:

 mk/bsd.pkg.mk              |  4 ++--
 mk/bsd.prefs.mk            |  9 ++++++++-
 mk/wrapper/wrapper-defs.mk |  4 ++--
 3 files changed, 12 insertions(+), 5 deletions(-)

diffs (59 lines):

diff -r 78dd48c16a50 -r 752b482739f0 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Wed Apr 29 14:12:54 2015 +0000
+++ b/mk/bsd.pkg.mk     Wed Apr 29 14:23:23 2015 +0000
@@ -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 @@
        ${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 -r 78dd48c16a50 -r 752b482739f0 mk/bsd.prefs.mk
--- a/mk/bsd.prefs.mk   Wed Apr 29 14:12:54 2015 +0000
+++ b/mk/bsd.prefs.mk   Wed Apr 29 14:23:23 2015 +0000
@@ -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 @@
 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 -r 78dd48c16a50 -r 752b482739f0 mk/wrapper/wrapper-defs.mk
--- a/mk/wrapper/wrapper-defs.mk        Wed Apr 29 14:12:54 2015 +0000
+++ b/mk/wrapper/wrapper-defs.mk        Wed Apr 29 14:23:23 2015 +0000
@@ -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