pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk/tools BUILDLINK_DEPENDS.* can be lists, so iterate ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/5bb067440bd8
branches:  trunk
changeset: 493781:5bb067440bd8
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sat May 14 21:38:18 2005 +0000

description:
BUILDLINK_DEPENDS.* can be lists, so iterate over the lists when creating
a proper BUILD_DEPENDS or DEPENDS list.

diffstat:

 mk/tools/perl.mk    |  9 +++++++--
 mk/tools/replace.mk |  9 +++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diffs (46 lines):

diff -r fbb88b2fd9b6 -r 5bb067440bd8 mk/tools/perl.mk
--- a/mk/tools/perl.mk  Sat May 14 21:15:07 2005 +0000
+++ b/mk/tools/perl.mk  Sat May 14 21:38:18 2005 +0000
@@ -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 @@
 .  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 -r fbb88b2fd9b6 -r 5bb067440bd8 mk/tools/replace.mk
--- a/mk/tools/replace.mk       Sat May 14 21:15:07 2005 +0000
+++ b/mk/tools/replace.mk       Sat May 14 21:38:18 2005 +0000
@@ -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 @@
 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



Home | Main Index | Thread Index | Old Index