summaryrefslogtreecommitdiff
path: root/mk/mysql.buildlink3.mk
diff options
context:
space:
mode:
authortv <tv>2005-03-24 17:46:00 +0000
committertv <tv>2005-03-24 17:46:00 +0000
commitbecbeb0d92ed90e67235a5d22f77020cb7d29952 (patch)
treed810c92114f578110af57e0a04897d51e7bceb57 /mk/mysql.buildlink3.mk
parentbbdac93695f620db587d57e13966052e8dffd9a5 (diff)
downloadpkgsrc-becbeb0d92ed90e67235a5d22f77020cb7d29952.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/mysql.buildlink3.mk')
-rw-r--r--mk/mysql.buildlink3.mk6
1 files changed, 2 insertions, 4 deletions
diff --git a/mk/mysql.buildlink3.mk b/mk/mysql.buildlink3.mk
index 36507426532..01439386fb5 100644
--- a/mk/mysql.buildlink3.mk
+++ b/mk/mysql.buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: mysql.buildlink3.mk,v 1.1 2004/10/28 11:28:27 xtraeme Exp $
+# $NetBSD: mysql.buildlink3.mk,v 1.2 2005/03/24 17:46:01 tv Exp $
.if !defined(MYSQL_VERSION_MK)
MYSQL_VERSION_MK= # defined
@@ -74,8 +74,6 @@ MYSQL_PKGSRCDIR= ../../databases/mysql3-client
PKG_SKIP_REASON+= "${_MYSQL_VERSION} is not a valid mysql package."
.endif
-.if (defined(USE_BUILDLINK3) && empty(USE_BUILDLINK3:M[nN][oO]))
-. include "${MYSQL_PKGSRCDIR}/buildlink3.mk"
-.endif
+.include "${MYSQL_PKGSRCDIR}/buildlink3.mk"
.endif # MYSQL_VERSION_MK