diff options
| author | obache <obache> | 2014-05-21 13:35:23 +0000 |
|---|---|---|
| committer | obache <obache> | 2014-05-21 13:35:23 +0000 |
| commit | 4ed3be7b51916a7255cda9534dd63af279f8f7ad (patch) | |
| tree | 4b18c8bbc745ffdae2a89633bf7289b55afa1fca /lang/perl5 | |
| parent | b52e078f06304d6ea1b7507a14f57cddbdf1c156 (diff) | |
| download | pkgsrc-4ed3be7b51916a7255cda9534dd63af279f8f7ad.tar.gz | |
Move pthread.buildlink3.mk from module.mk to buildlink3.mk with conditionally.
* In module.mk, pthread is marked as direct dependency unconditionally for
packages using module.mk. It is unwanted behavior.
* Include pthread.buildlink3.mk in buildlink3.mk only for the case perl5 is
built with "threads".
Fixes potential unwanted dependeny on pthread using perl5/module.mk.
Diffstat (limited to 'lang/perl5')
| -rw-r--r-- | lang/perl5/buildlink3.mk | 6 | ||||
| -rw-r--r-- | lang/perl5/module.mk | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/lang/perl5/buildlink3.mk b/lang/perl5/buildlink3.mk index 0ee0edec67c..6fc7537c8df 100644 --- a/lang/perl5/buildlink3.mk +++ b/lang/perl5/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.52 2013/05/31 10:55:15 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.53 2014/05/21 13:35:23 obache Exp $ BUILDLINK_TREE+= perl @@ -25,6 +25,10 @@ PERL5= ${PERLDIR}/bin/perl pkgbase := perl .include "../../mk/pkg-build-options.mk" +.if !empty(PKG_BUILD_OPTIONS.perl:Mthreads) +. include "../../mk/pthread.buildlink3.mk" +.endif + PERL5_OPTIONS?= # empty .if !empty(PERL5_OPTIONS:Mthreads) INSTALL_TEMPLATES+= ${.CURDIR}/../../lang/perl5/files/install_threads.tmpl diff --git a/lang/perl5/module.mk b/lang/perl5/module.mk index d8c22623729..47743e94bed 100644 --- a/lang/perl5/module.mk +++ b/lang/perl5/module.mk @@ -1,4 +1,4 @@ -# $NetBSD: module.mk,v 1.70 2014/02/17 04:28:45 obache Exp $ +# $NetBSD: module.mk,v 1.71 2014/05/21 13:35:23 obache Exp $ # # This Makefile fragment is intended to be included by packages that build # and install perl5 modules. @@ -230,6 +230,4 @@ LDFLAGS+= ${PERL5_LDFLAGS} .include "../../lang/perl5/packlist.mk" -.include "../../mk/pthread.buildlink3.mk" - .endif # PERL5_MODULE_MK |