Date: Tue, 04 Nov 2014 05:41:31 +0300 From: Andrey Chernov <ache@freebsd.org> To: Steve Wills <swills@freebsd.org> Cc: ports <ports@freebsd.org>, ruby@freebsd.org, Baptiste Daroussin <bapt@freebsd.org> Subject: Re: Can't build ruby20 on -current: it doesn't honor WITHOUT_CDDL=yes Message-ID: <54583CDB.9090704@freebsd.org> In-Reply-To: <20141030151458.GE4395@mouf.net> References: <54520ED5.6040907@freebsd.org> <20141030101739.GD63624@ivaldir.etoilebsd.net> <5452123A.40108@freebsd.org> <20141030151458.GE4395@mouf.net>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format. --------------000004050004040402020204 Content-Type: text/plain; charset=koi8-r Content-Transfer-Encoding: 7bit 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/ --------------000004050004040402020204 Content-Type: text/plain; charset=windows-1251; name="patch.txt" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="patch.txt" --- 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 --------------000004050004040402020204--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?54583CDB.9090704>