diff options
| author | jlam <jlam> | 2005-05-12 21:03:46 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2005-05-12 21:03:46 +0000 |
| commit | 6df3d7d7833caa25fc77542f6f8704988d362c19 (patch) | |
| tree | eccf9a37753a15dba47ca55610b63283bf55b6dd | |
| parent | 7dc1208e9c6c1f1d74bcc1d1c94da654a090e822 (diff) | |
| download | pkgsrc-6df3d7d7833caa25fc77542f6f8704988d362c19.tar.gz | |
Teach the new tools framework more about perl. We include perl5/vars.mk
in mk/tools/perl.mk since many packages expect to be able to use the
variables defined in vars.mk, but those variables can only be defined
if PERL5 is correctly defined, and that is only true after it is set
here.
| -rw-r--r-- | mk/bsd.pkg.use.mk | 4 | ||||
| -rw-r--r-- | mk/tools/perl.mk | 13 |
2 files changed, 14 insertions, 3 deletions
diff --git a/mk/bsd.pkg.use.mk b/mk/bsd.pkg.use.mk index d3a8f8f1d1b..b827a7295d5 100644 --- a/mk/bsd.pkg.use.mk +++ b/mk/bsd.pkg.use.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.use.mk,v 1.9 2005/05/12 20:31:56 jlam Exp $ +# $NetBSD: bsd.pkg.use.mk,v 1.10 2005/05/12 21:03:46 jlam Exp $ # # Turn USE_* macros into proper depedency logic. Included near the top of # bsd.pkg.mk, after bsd.prefs.mk. @@ -155,10 +155,12 @@ ${_PERL5_DEPMETHOD}+= ${_PERL5_DEPENDS}:${PERL5_PKGSRCDIR} . endif .endif +.if empty(_USE_NEW_TOOLS:M[yY][eE][sS]) .if defined(USE_PERL5) && (${USE_PERL5} == "run") CONFIGURE_ENV+= PERL=${PERL5:Q} . include "../../lang/perl5/vars.mk" .endif # USE_PERL5 == run +.endif .if defined(USE_PERL5) PLIST_SUBST+= PERL5_SITELIB=${PERL5_SUB_INSTALLSITELIB} diff --git a/mk/tools/perl.mk b/mk/tools/perl.mk index 3bfd729c1cd..8b703034bfe 100644 --- a/mk/tools/perl.mk +++ b/mk/tools/perl.mk @@ -1,4 +1,4 @@ -# $NetBSD: perl.mk,v 1.7 2005/05/11 19:42:17 jlam Exp $ +# $NetBSD: perl.mk,v 1.8 2005/05/12 21:03:46 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 @@ -12,13 +12,22 @@ MAKEFLAGS+= TOOLS_IGNORE.perl= TOOLS_DEPMETHOD.perl?= BUILD_DEPENDS TOOLS_DEPENDS.perl?= ${BUILDLINK_DEPENDS.perl}:${BUILDLINK_PKGSRCDIR.perl} TOOLS_CREATE+= perl -EVAL_PREFIX+= TOOLS_PREFIX.perl=perl +FIND_PREFIX:= TOOLS_PREFIX.perl=perl +. include "../../mk/find-prefix.mk" TOOLS_REAL_CMD.perl= ${TOOLS_PREFIX.perl}/bin/perl PERL5= ${TOOLS_REAL_CMD.perl} +CONFIGURE_ENV+= PERL=${PERL5:Q} . endif . if defined(TOOLS_DEPMETHOD.perl) && defined(TOOLS_DEPENDS.perl) . if empty(${TOOLS_DEPMETHOD.perl}:M${TOOLS_DEPENDS.perl}) ${TOOLS_DEPMETHOD.perl}+= ${TOOLS_DEPENDS.perl} . endif . endif + +# Define PERL5_* variables that locate the site directories for ${PERL5}. +# These variables depend on PERL5 being properly defined and existing +# on the filesystem. +# +. include "../../lang/perl5/vars.mk" + .endif |