diff options
| author | jlam <jlam> | 2005-05-18 22:42:07 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2005-05-18 22:42:07 +0000 |
| commit | 8c4b3e3c221421bb25a690c4c43371079fbe2d41 (patch) | |
| tree | 67b8f74bb10335e4db27319dcdd190d485ae9da0 /mk/tools/perl.mk | |
| parent | a8e34294c8ce4c2c9c9da65a80afae94b5a2ad48 (diff) | |
| download | pkgsrc-8c4b3e3c221421bb25a690c4c43371079fbe2d41.tar.gz | |
Goal: Remove USE_PERL5 from pkgsrc.
Plan:
(1) Change USE_PERL5=build into USE_TOOLS+=perl.
(2) Change all other USE_PERL5 into including perl5/buildlink3.mk.
Possibly, for packages that don't actually build anything with perl,
but merely require it for the perl interpreter, we can instead do:
USE_TOOLS+= perl
TOOLS_DEPMETHOD.perl= DEPENDS
but this is more verbose than simply including the perl5/buildlink3.mk
file.
Move the PERL5_REQD computation into a lang/perl5/version.mk file,
and only do the USE_PERL5 logic in bsd.pkg.use.mk if we're not using
the new tools framework. This consolidates all of the perl-handling
into two places -- lang/perl5 and mk/tools/perl.mk.
Diffstat (limited to 'mk/tools/perl.mk')
| -rw-r--r-- | mk/tools/perl.mk | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/mk/tools/perl.mk b/mk/tools/perl.mk index 7f191665639..4bc955c98a5 100644 --- a/mk/tools/perl.mk +++ b/mk/tools/perl.mk @@ -1,11 +1,14 @@ -# $NetBSD: perl.mk,v 1.11 2005/05/18 03:14:01 jlam Exp $ +# $NetBSD: perl.mk,v 1.12 2005/05/18 22:42:07 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 # is executed on systems that also provide a perl binary. # .if defined(USE_PERL5) -USE_TOOLS+= perl +USE_TOOLS+= perl +. if empty(USE_PERL5:Mbuild) +TOOLS_DEPMETHOD.perl?= DEPENDS +. endif .endif # Skip the processing at the end of replace.mk. If we need to use @@ -17,14 +20,9 @@ _TOOLS_USE_PKGSRC.perl= yes . if !empty(PKGPATH:Mlang/perl58) MAKEFLAGS+= TOOLS_IGNORE.perl= . else -. include "../../lang/perl5/buildlink3.mk" +. include "../../lang/perl5/version.mk" TOOLS_DEPMETHOD.perl?= BUILD_DEPENDS -_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_DEPENDS.perl?= {perl>=${PERL5_REQD},perl-thread>=${PERL5_REQD}}:../../lang/perl58 TOOLS_CREATE+= perl FIND_PREFIX:= TOOLS_PREFIX.perl=perl . include "../../mk/find-prefix.mk" |