summaryrefslogtreecommitdiff
path: root/mk/tools
diff options
context:
space:
mode:
authorrillig <rillig@pkgsrc.org>2019-04-03 18:37:24 +0000
committerrillig <rillig@pkgsrc.org>2019-04-03 18:37:24 +0000
commit0ea46b56a40e77d49fc4cf1daf264d24c148a325 (patch)
tree97608e64df439b0503b257a05bcd1b475236f8f1 /mk/tools
parent7ae8d6e77d47b66d340ee8d4be506e390449c84f (diff)
downloadpkgsrc-0ea46b56a40e77d49fc4cf1daf264d24c148a325.tar.gz
mk/tools/replace.mk: take versions of FLEX_REQD into account
If a package had said FLEX_REQD=1000.0, the actual dependency had still been flex>=2.5.4. Now all version numbers from FLEX_REQD are taken into account, too.
Diffstat (limited to 'mk/tools')
-rw-r--r--mk/tools/replace.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk
index 2088b170354..a8b4f66db32 100644
--- a/mk/tools/replace.mk
+++ b/mk/tools/replace.mk
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.288 2019/03/10 19:52:18 joerg Exp $
+# $NetBSD: replace.mk,v 1.289 2019/04/03 18:37:24 rillig Exp $
#
# Copyright (c) 2005 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -373,7 +373,7 @@ MAKEFLAGS+= TOOLS_IGNORE.flex=
. elif !empty(_TOOLS_USE_PKGSRC.flex:M[yY][eE][sS])
. include "../../devel/flex/buildlink3.mk"
_TOOLS_DEPENDS.flex= # empty
-. for _dep_ in ${BUILDLINK_API_DEPENDS.flex}
+. for _dep_ in ${BUILDLINK_API_DEPENDS.flex} ${FLEX_REQD:S,^,flex>=,}
_TOOLS_DEPENDS.flex+= ${_dep_}:${BUILDLINK_PKGSRCDIR.flex}
. endfor
TOOLS_DEPENDS.flex?= ${_TOOLS_DEPENDS.flex}