Wed Jan 27 10:45:47 2016 UTC ()
Fix MACHINE_PLATFORM match to ensure DTrace defaults to enabled on SunOS 5.11+.


(jperkin)
diff -r1.9 -r1.10 pkgsrc/lang/perl5/options.mk
cvs diff -r1.9 -r1.10 pkgsrc/lang/perl5/options.mk (expand / switch to unified diff)

--- pkgsrc/lang/perl5/options.mk 2014/06/04 14:24:37 1.9
+++ pkgsrc/lang/perl5/options.mk 2016/01/27 10:45:47 1.10
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.9 2014/06/04 14:24:37 richard Exp $ 1# $NetBSD: options.mk,v 1.10 2016/01/27 10:45:47 jperkin 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
@@ -32,27 +32,27 @@ PKG_SUGGESTED_OPTIONS= threads @@ -32,27 +32,27 @@ PKG_SUGGESTED_OPTIONS= threads
32PKG_SUGGESTED_OPTIONS+= 64bitint 32PKG_SUGGESTED_OPTIONS+= 64bitint
33. endif 33. endif
34.elif ${OPSYS} == "AIX" 34.elif ${OPSYS} == "AIX"
35. if defined(ABI) && ${ABI} == "64" 35. if defined(ABI) && ${ABI} == "64"
36PKG_SUGGESTED_OPTIONS+= 64bitall 36PKG_SUGGESTED_OPTIONS+= 64bitall
37. else 37. else
38PKG_SUGGESTED_OPTIONS+= 64bitnone 38PKG_SUGGESTED_OPTIONS+= 64bitnone
39. endif 39. endif
40.else 40.else
41PKG_SUGGESTED_OPTIONS+= 64bitauto 41PKG_SUGGESTED_OPTIONS+= 64bitauto
42.endif 42.endif
43 43
44# Note: dtrace command on Darwin lacks required -G option 44# Note: dtrace command on Darwin lacks required -G option
45.if !empty(MACHINE_PLATFORM:MSunOS-1[123456789].*-*) 45.if !empty(MACHINE_PLATFORM:MSunOS-5.1[1-9]-*)
46PKG_SUGGESTED_OPTIONS+= dtrace 46PKG_SUGGESTED_OPTIONS+= dtrace
47.endif 47.endif
48 48
49.include "../../mk/bsd.options.mk" 49.include "../../mk/bsd.options.mk"
50 50
51.if !empty(PKG_OPTIONS:Mthreads) 51.if !empty(PKG_OPTIONS:Mthreads)
52. include "../../mk/pthread.buildlink3.mk" 52. include "../../mk/pthread.buildlink3.mk"
53CONFIGURE_ARGS+= -Duseithreads 53CONFIGURE_ARGS+= -Duseithreads
54CFLAGS+= ${PTHREAD_CFLAGS} 54CFLAGS+= ${PTHREAD_CFLAGS}
55LDFLAGS+= ${PTHREAD_LDFLAGS} 55LDFLAGS+= ${PTHREAD_LDFLAGS}
56LIBSWANTED+= ${PTHREAD_LIBS:M-l*:S/^-l//} 56LIBSWANTED+= ${PTHREAD_LIBS:M-l*:S/^-l//}
57. if ${OBJECT_FMT} == "XCOFF" 57. if ${OBJECT_FMT} == "XCOFF"
58PERL5_RPATH_THREAD=-thread 58PERL5_RPATH_THREAD=-thread