summaryrefslogtreecommitdiff
path: root/mk/wrapper
diff options
context:
space:
mode:
authortv <tv@pkgsrc.org>2005-03-24 17:46:00 +0000
committertv <tv@pkgsrc.org>2005-03-24 17:46:00 +0000
commitfe3c1321bf998d62a4552a591092b48ed03f7428 (patch)
treed810c92114f578110af57e0a04897d51e7bceb57 /mk/wrapper
parent0b69fc27e289d5731e25e95b5792dd9b266a5653 (diff)
downloadpkgsrc-fe3c1321bf998d62a4552a591092b48ed03f7428.tar.gz
USE_BUILDLINK3 is no longer optional (and cannot be turned off). Per mail
to tech-pkg: ===== * USE_BUILDLINK3=YES will be unconditional. (In fact, USE_BUILDLINK3 will be ignored altogether by mk/; but see below.) * NO_BUILDLINK and NO_WRAPPER will be ignored by mk/. If a build happens, these phases will happen. * The existing NO_BUILD will imply the previous NO_BUILDLINK and NO_WRAPPER. If no build happens, those phases are not needed. * NO_TOOLS will be ignored by mk/. The tools phase, which provides much more than just the C compiler, will always happen regardless of package. This will make metapackage builds only slightly slower, in trade for far less user error.
Diffstat (limited to 'mk/wrapper')
-rw-r--r--mk/wrapper/bsd.wrapper.mk8
1 files changed, 2 insertions, 6 deletions
diff --git a/mk/wrapper/bsd.wrapper.mk b/mk/wrapper/bsd.wrapper.mk
index ba43c51e292..fb9e2af946e 100644
--- a/mk/wrapper/bsd.wrapper.mk
+++ b/mk/wrapper/bsd.wrapper.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.wrapper.mk,v 1.26 2005/03/08 00:52:31 grant Exp $
+# $NetBSD: bsd.wrapper.mk,v 1.27 2005/03/24 17:46:01 tv Exp $
#
# Copyright (c) 2004 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -52,11 +52,7 @@ _WRAP_VARS_MK= ${WRAPPER_DIR}/vars.mk
.PHONY: do-wrapper
-# USE_BUILDLINK3 == "no" implies NO_BUILDLINK
-.if !empty(USE_BUILDLINK3:M[nN][oO])
-NO_BUILDLINK= yes
-.endif
-.if !defined(NO_BUILDLINK)
+.if !defined(NO_BUILD)
. include "../../mk/buildlink3/bsd.buildlink3.mk"
.endif