diff options
| author | jlam <jlam@pkgsrc.org> | 2005-05-17 22:49:55 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2005-05-17 22:49:55 +0000 |
| commit | 59b1e9664d7517ecb83b95ece6c5dae949103984 (patch) | |
| tree | 78576e99ec4d2807cbbfd68b9b3fb8f6e9a8b089 | |
| parent | c52b8d79a5a38b17d3bd41cb53027250bf8687ab (diff) | |
| download | pkgsrc-59b1e9664d7517ecb83b95ece6c5dae949103984.tar.gz | |
If USE_TOOLS has "perl" then also define PERL5_PKGSRCDIR for use by
mk/tools/perl.mk. This fixes broken dependencies on perl where the
path to the package wasn't defined.
| -rw-r--r-- | mk/bsd.pkg.use.mk | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/mk/bsd.pkg.use.mk b/mk/bsd.pkg.use.mk index 4ea356da6fd..62f5eb2fa37 100644 --- a/mk/bsd.pkg.use.mk +++ b/mk/bsd.pkg.use.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.use.mk,v 1.11 2005/05/17 22:22:52 jlam Exp $ +# $NetBSD: bsd.pkg.use.mk,v 1.12 2005/05/17 22:49:55 jlam Exp $ # # Turn USE_* macros into proper depedency logic. Included near the top of # bsd.pkg.mk, after bsd.prefs.mk. @@ -138,6 +138,11 @@ _PERL5_STRICTEST_REQD= ${_version_} .endfor _PERL5_REQD= ${_PERL5_STRICTEST_REQD} +.if defined(USE_PERL5) || !empty(USE_TOOLS:Mperl) +_PERL5_DEPENDS= {perl>=${_PERL5_REQD},perl-thread>=${_PERL5_REQD}} +PERL5_PKGSRCDIR?= ../../lang/perl58 +.endif + # Convert USE_PERL5 to be two-valued: either "build" or "run" to denote # whether we want a build-time or run-time dependency on perl. # @@ -149,7 +154,6 @@ USE_PERL5:= run _PERL5_DEPMETHOD= DEPENDS . endif _PERL5_DEPENDS= {perl>=${_PERL5_REQD},perl-thread>=${_PERL5_REQD}} -PERL5_PKGSRCDIR?= ../../lang/perl58 . if !defined(BUILDLINK_DEPENDS.perl) ${_PERL5_DEPMETHOD}+= ${_PERL5_DEPENDS}:${PERL5_PKGSRCDIR} . endif |