diff options
| author | jlam <jlam> | 2004-11-17 22:55:14 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2004-11-17 22:55:14 +0000 |
| commit | b9f8eb441b37d19196dc38b65c16cc81e36165e9 (patch) | |
| tree | fbf32f7ffe22f6860e17719dbbbd229fb4d4665a | |
| parent | fe2a8311b772dcb0a95921a34f716a14c0906200 (diff) | |
| download | pkgsrc-b9f8eb441b37d19196dc38b65c16cc81e36165e9.tar.gz | |
Move selection of the default perl58 (whether it is threaded or not) into
bsd.pkg.mk. lang/perl58 now always builds perl58, while lang/perl58-thread
builds perl58-thread (POLS). Fixes PR pkg/28343.
| -rw-r--r-- | lang/perl58/Makefile | 14 | ||||
| -rw-r--r-- | mk/bsd.pkg.mk | 12 |
2 files changed, 13 insertions, 13 deletions
diff --git a/lang/perl58/Makefile b/lang/perl58/Makefile index 678fc7e4248..ede0736863c 100644 --- a/lang/perl58/Makefile +++ b/lang/perl58/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.59 2004/11/14 07:48:30 jlam Exp $ +# $NetBSD: Makefile,v 1.60 2004/11/17 22:55:15 jlam Exp $ # The following two variables should have empty values unless we're # building a perl snapshot or release candidate. @@ -149,20 +149,10 @@ PERL5_HINTS_LDDLFLAGS= # empty PERL5_HINTS_LDFLAGS+= ${LOCLIBRPATHFLAGS} -# On platforms that have native pthreads, default to installing the -# threaded perl. This can be overridden by explicitly setting -# PERL5_USE_THREADS. -# -.if exists(/usr/include/pthread.h) && \ - !empty(PREFER_NATIVE_PTHREADS:M[yY][eE][sS]) -PERL5_USE_THREADS?= yes -.else -PERL5_USE_THREADS?= no -.endif - # If perl58 is built with threads support, then name the package # "perl-thread", otherwise it's just "perl" as usual. # +PERL5_USE_THREADS?= no .if !empty(PERL5_USE_THREADS:M[nN][oO]) PERL5_PKGSUFFIX= # empty CONFLICTS+= perl-thread-[0-9]* diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index feeb6db91f6..cf47afa2595 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1539 2004/11/16 18:04:00 tv Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1540 2004/11/17 22:55:14 jlam Exp $ # # This file is in the public domain. # @@ -306,7 +306,17 @@ USE_PERL5:= run _PERL5_DEPMETHOD= DEPENDS . endif _PERL5_DEPENDS= {perl>=${_PERL5_REQD},perl-thread>=${_PERL5_REQD}} +# +# On platforms that have native pthreads, default to installing the +# threaded perl. This can be overridden by explicitly setting +# PERL5_USE_THREADS. +# +. if exists(/usr/include/pthread.h) && \ + !empty(PREFER_NATIVE_PTHREADS:M[yY][eE][sS]) +PERL5_PKGSRCDIR?= ../../lang/perl58-thread +. else PERL5_PKGSRCDIR?= ../../lang/perl58 +. endif . if !defined(BUILDLINK_DEPENDS.perl) ${_PERL5_DEPMETHOD}+= ${_PERL5_DEPENDS}:${PERL5_PKGSRCDIR} . endif |