summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authorobache <obache@pkgsrc.org>2014-06-04 09:19:56 +0000
committerobache <obache@pkgsrc.org>2014-06-04 09:19:56 +0000
commita892e103d8735c067de5d082894b2d41264f1c46 (patch)
tree9dc3bc607310ddbe5d00726343d46b115ada93ea /lang
parent6ba96ac7a95f137bac643725067a5651a36ee1ca (diff)
downloadpkgsrc-a892e103d8735c067de5d082894b2d41264f1c46.tar.gz
Move Haiku pthread hack to options.mk.
"pthreads broken on vax" hack had been removed, but it is also used for Haiku.
Diffstat (limited to 'lang')
-rw-r--r--lang/perl5/hacks.mk11
-rw-r--r--lang/perl5/options.mk9
2 files changed, 9 insertions, 11 deletions
diff --git a/lang/perl5/hacks.mk b/lang/perl5/hacks.mk
index 2869ad8b301..598af120bb6 100644
--- a/lang/perl5/hacks.mk
+++ b/lang/perl5/hacks.mk
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.12 2014/05/29 07:57:07 adam Exp $
+# $NetBSD: hacks.mk,v 1.13 2014/06/04 09:19:56 obache Exp $
.if !defined(PERL5_HACKS_MK)
PERL5_HACKS_MK= defined
@@ -64,15 +64,6 @@ PKG_HACKS+= m68k-codegen
BUILDLINK_TRANSFORM+= rename:-O[0-9]*:-Os
.endif
-### [Thr Mar 21 22:20:00 JST 2013 : obache]
-### from KNOWN PROBLEMS in README.haiku
-### Perl cannot be compiled with threading support ATM.
-###
-.if !empty(MACHINE_PLATFORM:MHaiku-*-*)
-PKG_HACKS+= broken-haiku-pthreads
-PERL5_BUILD_THREADS_SUPPORT= no
-.endif
-
### [Fri Jan 31 11:09:04 CST 2014 : schnoebe]
### gcc-4.*.* in NetBSD/alpha causes unaligned access exception in perl.
### -O works around, and there is a report that -O2 -fno-tree-ter is enough.
diff --git a/lang/perl5/options.mk b/lang/perl5/options.mk
index 7c34393fd7b..8e1f499e00c 100644
--- a/lang/perl5/options.mk
+++ b/lang/perl5/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.7 2014/05/22 08:17:10 martin Exp $
+# $NetBSD: options.mk,v 1.8 2014/06/04 09:19:56 obache Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.perl
PKG_OPTIONS_REQUIRED_GROUPS= perlbits
@@ -16,6 +16,13 @@ PERL5_BUILD_THREADS_SUPPORT= yes
PERL5_BUILD_THREADS_SUPPORT= ${DLOPEN_REQUIRE_PTHREADS}
.endif
+### from KNOWN PROBLEMS in README.haiku
+### Perl cannot be compiled with threading support ATM.
+###
+.if !empty(MACHINE_PLATFORM:MHaiku-*-*)
+PERL5_BUILD_THREADS_SUPPORT= no
+.endif
+
.if !empty(PERL5_BUILD_THREADS_SUPPORT:M[yY][eE][sS])
PKG_SUGGESTED_OPTIONS= threads
.endif