diff options
| author | minskim <minskim> | 2007-11-18 21:44:56 +0000 |
|---|---|---|
| committer | minskim <minskim> | 2007-11-18 21:44:56 +0000 |
| commit | 61852de679cdbc0ddd291139c82d9633d25ce16b (patch) | |
| tree | 3ca9ac1107a8e71bfd27ecb7b0c3f379bfdd2b31 | |
| parent | c5ea142af5ffb97d137510346ffc172eafa986dd (diff) | |
| download | pkgsrc-61852de679cdbc0ddd291139c82d9633d25ce16b.tar.gz | |
If perl is buildlinked, used perl in ${BUILDLINK_PREFIX.perl} and
do not rely on the tools framework.
| -rw-r--r-- | lang/perl5/buildlink3.mk | 4 | ||||
| -rw-r--r-- | lang/perl5/module.mk | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/lang/perl5/buildlink3.mk b/lang/perl5/buildlink3.mk index 48a95cfdbde..dba07063d4d 100644 --- a/lang/perl5/buildlink3.mk +++ b/lang/perl5/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.36 2006/12/12 21:52:36 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.37 2007/11/18 21:44:56 minskim Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ PERL5_BUILDLINK3_MK:= ${PERL5_BUILDLINK3_MK}+ @@ -13,9 +13,7 @@ BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}perl .if !empty(PERL5_BUILDLINK3_MK:M+) .include "../../mk/bsd.fast.prefs.mk" -USE_TOOLS+= perl PERL5_REQD+= 5.8.7 -TOOLS_DEPENDS.perl= # buildlink3 will handle the dependency BUILDLINK_API_DEPENDS.perl+= perl>=${PERL5_REQD} BUILDLINK_PKGSRCDIR.perl?= ../../lang/perl5 diff --git a/lang/perl5/module.mk b/lang/perl5/module.mk index 09bdc524700..5c93d1f6c73 100644 --- a/lang/perl5/module.mk +++ b/lang/perl5/module.mk @@ -1,4 +1,4 @@ -# $NetBSD: module.mk,v 1.55 2007/05/26 12:46:20 heinz Exp $ +# $NetBSD: module.mk,v 1.56 2007/11/18 21:44:56 minskim Exp $ # # This Makefile fragment is intended to be included by packages that build # and install perl5 modules. @@ -106,7 +106,7 @@ do-makemaker-configure: if ${TEST} -f "$$dir"/Makefile.PL; then \ cd "$$dir"; \ ${SETENV} ${MAKE_ENV} \ - ${PERL5} Makefile.PL ${MAKE_PARAMS}; \ + ${BUILDLINK_PREFIX.perl}/bin/perl Makefile.PL ${MAKE_PARAMS}; \ fi; \ done @@ -118,7 +118,7 @@ do-modbuild-configure: if ${TEST} -f "$$dir"/Build.PL; then \ cd "$$dir"; \ ${SETENV} ${MAKE_ENV} \ - ${PERL5} Build.PL ${MAKE_PARAMS}; \ + ${BUILDLINK_PREFIX.perl}/bin/perl Build.PL ${MAKE_PARAMS}; \ fi; \ done |