Sun Nov 13 16:03:31 2016 UTC ()

Explicitly disable dtrace on NetBSD/i386 (7.99.*).

Should be fix PR pkg/51613.


(taca)

diff -r1.1 -r1.2 pkgsrc/lang/ruby/platform.mk

--- pkgsrc/lang/ruby/platform.mk 2016/11/13 15:14:19 1.1
+++ pkgsrc/lang/ruby/platform.mk 2016/11/13 16:03:31 1.2

	@@ -1,14 +1,14 @@			@@ -1,14 +1,14 @@
1	# $NetBSD: platform.mk,v 1.1 2016/11/13 15:14:19 taca Exp $		1	# $NetBSD: platform.mk,v 1.2 2016/11/13 16:03:31 taca Exp $
2	#		2	#
3			3
4	#		4	#
5	# Common definition for ruby*-base package (except ruby18-base).		5	# Common definition for ruby*-base package (except ruby18-base).
6	#		6	#
7			7
8	.if !defined(_RUBY_PLATFORM_MK)		8	.if !defined(_RUBY_PLATFORM_MK)
9	_RUBY_PLATFORM_MK= # defined		9	_RUBY_PLATFORM_MK= # defined
10			10
11	.include "../../lang/ruby/rubyversion.mk"		11	.include "../../lang/ruby/rubyversion.mk"
12	.include "../../mk/compiler.mk"		12	.include "../../mk/compiler.mk"
13			13
14	MAKE_DIRS+= ${RUBY_SITEARCHLIB} ${RUBY_VENDORARCHLIB} ${RUBY_SITERIDIR}		14	MAKE_DIRS+= ${RUBY_SITEARCHLIB} ${RUBY_VENDORARCHLIB} ${RUBY_SITERIDIR}
	@@ -66,26 +66,36 @@ USE_BUILTIN.openssl= no			@@ -66,26 +66,36 @@ USE_BUILTIN.openssl= no
66	CONFIGURE_ENV+= ac_cv_header_ucontext_h=no		66	CONFIGURE_ENV+= ac_cv_header_ucontext_h=no
67	.endif		67	.endif
68			68
69	#		69	#
70	# Linux		70	# Linux
71	#		71	#
72	# /usr/bin/dtrace is not DTrace.		72	# /usr/bin/dtrace is not DTrace.
73	#		73	#
74	.if ${OPSYS} == "Linux" && exists(/usr/bin/dtrace)		74	.if ${OPSYS} == "Linux" && exists(/usr/bin/dtrace)
75	CONFIGURE_ARGS+= --disable-dtrace		75	CONFIGURE_ARGS+= --disable-dtrace
76	.endif		76	.endif
77			77
78	#		78	#
			79	# NetBSD
			80	#
			81	# dtrace support has problem on i386. (No official NetBSD release is
			82	# built with dtrace enabled yet, so this problem is on 7.99.* only.)
			83	#
			84	.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "i386"
			85	CONFIGURE_ARGS+= --disable-dtrace
			86	.endif
			87
			88	#
79	# Solaris		89	# Solaris
80	#		90	#
81	# fix build with sunpro.		91	# fix build with sunpro.
82	#		92	#
83	.if !empty(PKGSRC_COMPILER:Msunpro)		93	.if !empty(PKGSRC_COMPILER:Msunpro)
84	LIBS.SunOS+= -B static -lsunmath -B dynamic -lm		94	LIBS.SunOS+= -B static -lsunmath -B dynamic -lm
85	LDFLAGS.SunOS+= -L${SUNWSPROBASE}/lib -Wl,-R${SUNWSPROBASE}/lib		95	LDFLAGS.SunOS+= -L${SUNWSPROBASE}/lib -Wl,-R${SUNWSPROBASE}/lib
86	CONFIGURE_ENV+= LDSHARED="${CC} -G"		96	CONFIGURE_ENV+= LDSHARED="${CC} -G"
87	.else		97	.else
88	LIBS.SunOS+= -lm		98	LIBS.SunOS+= -lm
89	.endif		99	.endif
90			100
91	CONFIGURE_ENV.SunOS+= OBJCOPY=:		101	CONFIGURE_ENV.SunOS+= OBJCOPY=: