summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2004-11-17 22:55:14 +0000
committerjlam <jlam@pkgsrc.org>2004-11-17 22:55:14 +0000
commit55ba984801225acce90bdd662fb480eb895c1ce7 (patch)
treefbf32f7ffe22f6860e17719dbbbd229fb4d4665a /lang
parent18efda262a546e61ba13d74669871d6ea9f25a06 (diff)
downloadpkgsrc-55ba984801225acce90bdd662fb480eb895c1ce7.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.
Diffstat (limited to 'lang')
-rw-r--r--lang/perl58/Makefile14
1 files changed, 2 insertions, 12 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]*