From owner-freebsd-current@freebsd.org Mon Sep 14 22:17:30 2015 Return-Path: Delivered-To: freebsd-current@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DAFE4A0318D for ; Mon, 14 Sep 2015 22:17:30 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: from mail-qg0-x229.google.com (mail-qg0-x229.google.com [IPv6:2607:f8b0:400d:c04::229]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 9380C19CD; Mon, 14 Sep 2015 22:17:30 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: by qgx61 with SMTP id 61so128126860qgx.3; Mon, 14 Sep 2015 15:17:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=cUmhAfNjzMZMxzhmcW5eN4w/eLxhGVbrdEFsa2p4VII=; b=huZzTfxCMp3MdhxQuvAbHlc9GURl26LTG5ZDJBSkqaMyG7gZj6lrh3WcLNFLWP5SdT upCPVubKZyHtB/oDyKcAdR/vGfRoRPmvrovY8ep7me6XPqRwkq8Bnb5Qkm9Tg2Q/XStv Gr8NPw9sfhaHWUZ/HddxdCGS3/1AP7HSSsIyxsIyPxFMV1TbGlsUJ/fVknb7Wg8yX9je +NcrZqRhc7br5dFKWlpC5DValal1CFCFDngEZondK3zLU9BzKJiNPhW019pitAbaebWz mUoVgw2IqxuBgW1GwChFPLUoOwIMNzWqBP1M7iBqpON9emqN/0IZuG6VmF4PC0Uqz+xV CqBQ== X-Received: by 10.140.145.145 with SMTP id 139mr27342370qhr.100.1442269049723; Mon, 14 Sep 2015 15:17:29 -0700 (PDT) Received: from muskytusk ([104.236.250.12]) by smtp.gmail.com with ESMTPSA id a73sm6767204qkj.27.2015.09.14.15.17.28 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Sep 2015 15:17:29 -0700 (PDT) Sender: Mark Johnston Date: Mon, 14 Sep 2015 22:16:56 +0000 From: Mark Johnston To: Ryan Stone Cc: "Alexander V. Chernikov" , FreeBSD CURRENT Subject: Re: kernel dtrace and current Message-ID: <20150914221656.GB15213@muskytusk> References: <738721442150603@web6j.yandex.ru> <20150913205333.GA2444@muskytusk> <363291442225336@web1h.yandex.ru> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.23 (2014-03-12) X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Sep 2015 22:17:31 -0000 On Mon, Sep 14, 2015 at 11:54:27AM -0400, Ryan Stone wrote: > On Mon, Sep 14, 2015 at 6:08 AM, Alexander V. Chernikov < > melifaro@freebsd.org> wrote: > > > (So I suppose that for some reason I got old ctfmerge) > > > > I believe that ctfmerge is only built as a bootstrap tool when the host > system's FreeBSD version is obsolete. Mark, you probably should update > Makefile.inc1. Right, thanks. I'll commit the change below in a bit; it'll force ctfmerge to be rebuilt until the next __FreeBSD_version bump (the last one occurred 10 days before the ctfmerge fix went in). Bumping the version just for this seems like overkill, given that it's a simple bug fix that doesn't introduce any incompatibilities. diff --git a/Makefile.inc1 b/Makefile.inc1 index 397c1af..a2058dc 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1358,7 +1358,7 @@ ${_bt}-usr.bin/clang/tblgen: ${_bt}-lib/clang/libllvmtablegen ${_bt}-lib/clang/l # ELF Tool Chain libraries are needed for ELF tools and dtrace tools. # dtrace tools are required for older bootstrap env and cross-build # pre libdwarf -.if ${BOOTSTRAPPING} < 1100006 || (${MACHINE} != ${TARGET} || \ +.if ${BOOTSTRAPPING} < 1100080 || (${MACHINE} != ${TARGET} || \ ${MACHINE_ARCH} != ${TARGET_ARCH}) .if ${MK_CDDL} != "no" _dtrace_tools= cddl/usr.bin/sgsmsg cddl/lib/libctf cddl/usr.bin/ctfconvert \