Wed Jun 4 09:19:56 2014 UTC ()
Move Haiku pthread hack to options.mk.
"pthreads broken on vax" hack had been removed, but it is also used for Haiku.


(obache)
diff -r1.12 -r1.13 pkgsrc/lang/perl5/hacks.mk
diff -r1.7 -r1.8 pkgsrc/lang/perl5/options.mk
cvs diff -r1.12 -r1.13 pkgsrc/lang/perl5/hacks.mk (expand / switch to unified diff)

--- pkgsrc/lang/perl5/hacks.mk 2014/05/29 07:57:07 1.12
+++ pkgsrc/lang/perl5/hacks.mk 2014/06/04 09:19:56 1.13
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: hacks.mk,v 1.12 2014/05/29 07:57:07 adam Exp $ 1# $NetBSD: hacks.mk,v 1.13 2014/06/04 09:19:56 obache Exp $
2 2
3.if !defined(PERL5_HACKS_MK) 3.if !defined(PERL5_HACKS_MK)
4PERL5_HACKS_MK= defined 4PERL5_HACKS_MK= defined
5 5
6.include "../../mk/compiler.mk" 6.include "../../mk/compiler.mk"
7 7
8### [Thu Jun 7 04:25:34 UTC 2001 : jlam] 8### [Thu Jun 7 04:25:34 UTC 2001 : jlam]
9### Fix brokenness when using an older toolchain (gcc<3.3) on 9### Fix brokenness when using an older toolchain (gcc<3.3) on
10### NetBSD/sparc64. Pass -g and -DDEBUGGING to the compiler to 10### NetBSD/sparc64. Pass -g and -DDEBUGGING to the compiler to
11### circumvent some code-generation bugs. 11### circumvent some code-generation bugs.
12### 12###
13.if !empty(MACHINE_PLATFORM:MNetBSD-*-sparc64) 13.if !empty(MACHINE_PLATFORM:MNetBSD-*-sparc64)
14. if !empty(CC_VERSION:Mgcc*) 14. if !empty(CC_VERSION:Mgcc*)
@@ -54,34 +54,25 @@ CFLAGS+= -fno-cse-skip-blocks @@ -54,34 +54,25 @@ CFLAGS+= -fno-cse-skip-blocks
54### do that for fpu branch insns, resulting in an out-of-range FPU 54### do that for fpu branch insns, resulting in an out-of-range FPU
55### assembler branch instruction error in "ext/re/re_exec.c". 55### assembler branch instruction error in "ext/re/re_exec.c".
56### 56###
57### As a workaround, building with "-Os" instead of "-O2" reduces 57### As a workaround, building with "-Os" instead of "-O2" reduces
58### the size of the object file enough to allow short branches. 58### the size of the object file enough to allow short branches.
59### 59###
60### See PR toolchain/45439. 60### See PR toolchain/45439.
61 61
62.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "m68k" 62.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "m68k"
63PKG_HACKS+= m68k-codegen 63PKG_HACKS+= m68k-codegen
64BUILDLINK_TRANSFORM+= rename:-O[0-9]*:-Os 64BUILDLINK_TRANSFORM+= rename:-O[0-9]*:-Os
65.endif 65.endif
66 66
67### [Thr Mar 21 22:20:00 JST 2013 : obache] 
68### from KNOWN PROBLEMS in README.haiku 
69### Perl cannot be compiled with threading support ATM. 
70### 
71.if !empty(MACHINE_PLATFORM:MHaiku-*-*) 
72PKG_HACKS+= broken-haiku-pthreads 
73PERL5_BUILD_THREADS_SUPPORT= no 
74.endif 
75 
76### [Fri Jan 31 11:09:04 CST 2014 : schnoebe] 67### [Fri Jan 31 11:09:04 CST 2014 : schnoebe]
77### gcc-4.*.* in NetBSD/alpha causes unaligned access exception in perl. 68### gcc-4.*.* in NetBSD/alpha causes unaligned access exception in perl.
78### -O works around, and there is a report that -O2 -fno-tree-ter is enough. 69### -O works around, and there is a report that -O2 -fno-tree-ter is enough.
79.if (!empty(MACHINE_PLATFORM:MNetBSD-*-alpha) || !empty(MACHINE_PLATFORM:MOpenBSD-*-alpha)) \ 70.if (!empty(MACHINE_PLATFORM:MNetBSD-*-alpha) || !empty(MACHINE_PLATFORM:MOpenBSD-*-alpha)) \
80 && !empty(CC_VERSION:Mgcc-4.*.*) 71 && !empty(CC_VERSION:Mgcc-4.*.*)
81# XXX: is there any good way to replace the default -O2 with multiple args? 72# XXX: is there any good way to replace the default -O2 with multiple args?
82PKG_HACKS+= alpha-optimisation 73PKG_HACKS+= alpha-optimisation
83#BUILDLINK_TRANSFORM+= rename:-O[2-9]*:-O2 -fno-tree-ter 74#BUILDLINK_TRANSFORM+= rename:-O[2-9]*:-O2 -fno-tree-ter
84CFLAGS+=-fno-tree-ter 75CFLAGS+=-fno-tree-ter
85.endif 76.endif
86 77
87.endif # PERL5_HACKS_MK 78.endif # PERL5_HACKS_MK
cvs diff -r1.7 -r1.8 pkgsrc/lang/perl5/options.mk (expand / switch to unified diff)

--- pkgsrc/lang/perl5/options.mk 2014/05/22 08:17:10 1.7
+++ pkgsrc/lang/perl5/options.mk 2014/06/04 09:19:56 1.8
@@ -1,31 +1,38 @@ @@ -1,31 +1,38 @@
1# $NetBSD: options.mk,v 1.7 2014/05/22 08:17:10 martin Exp $ 1# $NetBSD: options.mk,v 1.8 2014/06/04 09:19:56 obache Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.perl 3PKG_OPTIONS_VAR= PKG_OPTIONS.perl
4PKG_OPTIONS_REQUIRED_GROUPS= perlbits 4PKG_OPTIONS_REQUIRED_GROUPS= perlbits
5PKG_OPTIONS_GROUP.perlbits= 64bitauto 64bitint 64bitmore 64bitall 64bitnone 5PKG_OPTIONS_GROUP.perlbits= 64bitauto 64bitint 64bitmore 64bitall 64bitnone
6PKG_SUPPORTED_OPTIONS= debug dtrace threads mstats 6PKG_SUPPORTED_OPTIONS= debug dtrace threads mstats
7 7
8CHECK_BUILTIN.pthread:= yes 8CHECK_BUILTIN.pthread:= yes
9.include "../../mk/pthread.builtin.mk" 9.include "../../mk/pthread.builtin.mk"
10CHECK_BUILTIN.pthread:= no 10CHECK_BUILTIN.pthread:= no
11 11
12# By default, build with threads only if the threads are native. 12# By default, build with threads only if the threads are native.
13.if !empty(USE_BUILTIN.pthread:M[yY][eE][sS]) 13.if !empty(USE_BUILTIN.pthread:M[yY][eE][sS])
14PERL5_BUILD_THREADS_SUPPORT= yes 14PERL5_BUILD_THREADS_SUPPORT= yes
15.else 15.else
16PERL5_BUILD_THREADS_SUPPORT= ${DLOPEN_REQUIRE_PTHREADS} 16PERL5_BUILD_THREADS_SUPPORT= ${DLOPEN_REQUIRE_PTHREADS}
17.endif 17.endif
18 18
 19### from KNOWN PROBLEMS in README.haiku
 20### Perl cannot be compiled with threading support ATM.
 21###
 22.if !empty(MACHINE_PLATFORM:MHaiku-*-*)
 23PERL5_BUILD_THREADS_SUPPORT= no
 24.endif
 25
19.if !empty(PERL5_BUILD_THREADS_SUPPORT:M[yY][eE][sS]) 26.if !empty(PERL5_BUILD_THREADS_SUPPORT:M[yY][eE][sS])
20PKG_SUGGESTED_OPTIONS= threads 27PKG_SUGGESTED_OPTIONS= threads
21.endif 28.endif
22 29
23.if ${OPSYS} == "IRIX" 30.if ${OPSYS} == "IRIX"
24. if defined(ABI) && ${ABI} == "64" 31. if defined(ABI) && ${ABI} == "64"
25PKG_SUGGESTED_OPTIONS+= 64bitint 32PKG_SUGGESTED_OPTIONS+= 64bitint
26. endif 33. endif
27.elif ${OPSYS} == "AIX" 34.elif ${OPSYS} == "AIX"
28. if defined(ABI) && ${ABI} == "64" 35. if defined(ABI) && ${ABI} == "64"
29PKG_SUGGESTED_OPTIONS+= 64bitall 36PKG_SUGGESTED_OPTIONS+= 64bitall
30. else 37. else
31PKG_SUGGESTED_OPTIONS+= 64bitnone 38PKG_SUGGESTED_OPTIONS+= 64bitnone