diff options
| author | jlam <jlam@pkgsrc.org> | 2005-05-14 21:38:18 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2005-05-14 21:38:18 +0000 |
| commit | d096bd6d746eaabd31a0efbac0a856ee13cb74d5 (patch) | |
| tree | bf8023867cf22c8faa849024523445c5cf18c732 | |
| parent | b37e6d4830f355df0e0b17b933e8164a322443ec (diff) | |
| download | pkgsrc-d096bd6d746eaabd31a0efbac0a856ee13cb74d5.tar.gz | |
BUILDLINK_DEPENDS.* can be lists, so iterate over the lists when creating
a proper BUILD_DEPENDS or DEPENDS list.
| -rw-r--r-- | mk/tools/perl.mk | 9 | ||||
| -rw-r--r-- | mk/tools/replace.mk | 9 |
2 files changed, 14 insertions, 4 deletions
diff --git a/mk/tools/perl.mk b/mk/tools/perl.mk index 8b703034bfe..e9bdd6bdad5 100644 --- a/mk/tools/perl.mk +++ b/mk/tools/perl.mk @@ -1,4 +1,4 @@ -# $NetBSD: perl.mk,v 1.8 2005/05/12 21:03:46 jlam Exp $ +# $NetBSD: perl.mk,v 1.9 2005/05/14 21:38:18 jlam Exp $ # Create a symlink from ${TOOLS_DIR}/bin/perl to ${PERL5} when USE_PERL5 # is defined. This ensures that when "perl" is invoked, the pkgsrc perl @@ -10,7 +10,12 @@ MAKEFLAGS+= TOOLS_IGNORE.perl= . else . include "../../lang/perl5/buildlink3.mk" TOOLS_DEPMETHOD.perl?= BUILD_DEPENDS -TOOLS_DEPENDS.perl?= ${BUILDLINK_DEPENDS.perl}:${BUILDLINK_PKGSRCDIR.perl} +_TOOLS_DEPENDS.perl= # empty +. for _dep_ in ${BUILDLINK_DEPENDS.perl} +_TOOLS_DEPENDS.perl+= ${_dep_}:${BUILDLINK_PKGSRCDIR.perl} +. endfor +. undef _dep_ +TOOLS_DEPENDS.perl?= ${_TOOLS_DEPENDS.perl} TOOLS_CREATE+= perl FIND_PREFIX:= TOOLS_PREFIX.perl=perl . include "../../mk/find-prefix.mk" diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk index f821a187c13..7d567da7d68 100644 --- a/mk/tools/replace.mk +++ b/mk/tools/replace.mk @@ -1,4 +1,4 @@ -# $NetBSD: replace.mk,v 1.73 2005/05/14 21:15:07 jlam Exp $ +# $NetBSD: replace.mk,v 1.74 2005/05/14 21:38:18 jlam Exp $ # # This Makefile fragment handles "replacements" of system-supplied # tools with pkgsrc versions. @@ -543,7 +543,12 @@ TOOLS_${_TOOLS_VARNAME.install}= ${TOOLS_REAL_CMD.install} MAKEFLAGS+= TOOLS_IGNORE.lex= . elif !empty(_TOOLS_USE_PKGSRC.lex:M[yY][eE][sS]) . include "../../devel/flex/buildlink3.mk" -TOOLS_DEPENDS.lex?= ${BUILDLINK_DEPENDS.flex}:${BUILDLINK_PKGSRCDIR.flex} +_TOOLS_DEPENDS.lex= # empty +. for _dep_ in ${BUILDLINK_DEPENDS.flex} +_TOOLS_DEPENDS.lex+= ${_dep_}:${BUILDLINK_PKGSRCDIR.flex} +. endfor +. undef _dep_ +TOOLS_DEPENDS.lex?= ${_TOOLS_DEPENDS.lex} TOOLS_CREATE+= lex TOOLS_FIND_PREFIX+= TOOLS_PREFIX.lex=flex TOOLS_REAL_CMD.lex= ${TOOLS_PREFIX.lex}/bin/flex |