From owner-freebsd-ruby@FreeBSD.ORG Tue Nov 4 02:41:40 2014 Return-Path: Delivered-To: ruby@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AD880B12 for ; Tue, 4 Nov 2014 02:41:40 +0000 (UTC) Received: from mail-lb0-f170.google.com (mail-lb0-f170.google.com [209.85.217.170]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2DFAFF82 for ; Tue, 4 Nov 2014 02:41:39 +0000 (UTC) Received: by mail-lb0-f170.google.com with SMTP id z12so1993896lbi.1 for ; Mon, 03 Nov 2014 18:41:31 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:message-id:date:from:user-agent:mime-version:to :cc:subject:references:in-reply-to:content-type; bh=fAiV2RfMqos666bDfN2YMvHab6J8byfMnOhXDlv3iTI=; b=OrMXNH0RuA9Q9y+w2RnhmeIWdEXhYp9TCbH7vJbnkGSv+YM/CaHU9TXnw98zT62jCJ BxUG/NA1gV5Ul1kINWHD2cKtpmlLgWNuXllGSm3MR6+CeF27I3VI+kfWwyS5HMQZfsoD wAL52sKedUpGJeGputUHFNzX+Hmmtcu02lO2dSe6rz6dcxl0HN7sK99wrEqKJJlu5+/W NpQF1IXQQSvxzXN22yXhoxkqYgHtYofnofPEJ/iAgw5feolNtj4I4Knn7jgpQlQODR9d kgWxjupjy6vXRnZuvplpK+ae0bfU9qyFg2BectZPwwnwZhMndSJJBI77GaN1juyzCxbj D1KA== X-Gm-Message-State: ALoCoQlFcLuv742kvU/MWBlksUWyHPxdJDhZB/Sx0a2IZpa0aArHestmuGWWWHMPoa6nwHDF+aMT X-Received: by 10.112.64.66 with SMTP id m2mr32186112lbs.53.1415068891741; Mon, 03 Nov 2014 18:41:31 -0800 (PST) Received: from [192.168.1.2] ([89.169.173.68]) by mx.google.com with ESMTPSA id qk3sm1341555lbb.19.2014.11.03.18.41.30 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 03 Nov 2014 18:41:30 -0800 (PST) Message-ID: <54583CDB.9090704@freebsd.org> Date: Tue, 04 Nov 2014 05:41:31 +0300 From: Andrey Chernov User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:31.0) Gecko/20100101 Thunderbird/31.2.0 MIME-Version: 1.0 To: Steve Wills Subject: Re: Can't build ruby20 on -current: it doesn't honor WITHOUT_CDDL=yes References: <54520ED5.6040907@freebsd.org> <20141030101739.GD63624@ivaldir.etoilebsd.net> <5452123A.40108@freebsd.org> <20141030151458.GE4395@mouf.net> In-Reply-To: <20141030151458.GE4395@mouf.net> Content-Type: multipart/mixed; boundary="------------000004050004040402020204" Cc: ports , ruby@freebsd.org, Baptiste Daroussin X-BeenThere: freebsd-ruby@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: FreeBSD-specific Ruby discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Nov 2014 02:41:40 -0000 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--