Can't build ruby20 on -current: it doesn't honor WITHOUT_CDDL=yes

[Andrey Chernov]

On 30.10.2014 18:15, Steve Wills wrote:
> The checks for OS version weren't meant to detect presence of dtrace, they were
> meant to detect presence of dtrace with usable USDT. Unfortunately, presence of
> /usr/sbin/dtrace doesn't necessarily mean USDT works. So, both checks need to
> be there. I'll take a look when I can, but if someone else gets there first,
> great.

Do you approve the patch attached?

-- 
http://ache.vniz.net/
-------------- next part --------------
--- Makefile.old	2014-10-05 14:23:41.000000000 +0400
+++ Makefile	2014-11-04 05:36:38.000000000 +0300
@@ -86,7 +86,9 @@
 LIBS+=		-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 .if ${OPSYS} == "FreeBSD"
-.if (${ARCH} == "i386" && ${OSVERSION} > 1010000) || (${ARCH} == "amd64" && ${OSVERSION} > 903000)
+.if exists(/usr/sbin/dtrace) && \
+	((${ARCH} == "i386" && ${OSVERSION} > 1010000) || \
+	(${ARCH} == "amd64" && ${OSVERSION} > 903000))
 CONFIGURE_ARGS+=	--enable-dtrace
 .else
 CONFIGURE_ARGS+=	--disable-dtrace