pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mk If USE_TOOLS has "perl" then also define PERL5_PKGS...
details: https://anonhg.NetBSD.org/pkgsrc/rev/69d6f1b6c2a6
branches: trunk
changeset: 493983:69d6f1b6c2a6
user: jlam <jlam%pkgsrc.org@localhost>
date: Tue May 17 22:49:55 2005 +0000
description:
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.
diffstat:
mk/bsd.pkg.use.mk | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diffs (29 lines):
diff -r 4f7163b6c655 -r 69d6f1b6c2a6 mk/bsd.pkg.use.mk
--- a/mk/bsd.pkg.use.mk Tue May 17 22:22:52 2005 +0000
+++ b/mk/bsd.pkg.use.mk Tue May 17 22:49:55 2005 +0000
@@ -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 @@
.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 @@
_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
Home |
Main Index |
Thread Index |
Old Index