From owner-svn-src-head@FreeBSD.ORG Thu Jun 13 19:42:50 2013 Return-Path: Delivered-To: svn-src-head@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id C6D971F9; Thu, 13 Jun 2013 19:42:50 +0000 (UTC) (envelope-from brooks@lor.one-eyed-alien.net) Received: from lor.one-eyed-alien.net (lor.one-eyed-alien.net [69.66.77.232]) by mx1.freebsd.org (Postfix) with ESMTP id 7BCC91F8A; Thu, 13 Jun 2013 19:42:49 +0000 (UTC) Received: from lor.one-eyed-alien.net (localhost [127.0.0.1]) by lor.one-eyed-alien.net (8.14.5/8.14.5) with ESMTP id r5DJgh1P011380; Thu, 13 Jun 2013 14:42:43 -0500 (CDT) (envelope-from brooks@lor.one-eyed-alien.net) Received: (from brooks@localhost) by lor.one-eyed-alien.net (8.14.5/8.14.5/Submit) id r5DJgh70011379; Thu, 13 Jun 2013 14:42:43 -0500 (CDT) (envelope-from brooks) Date: Thu, 13 Jun 2013 14:42:43 -0500 From: Brooks Davis To: Dimitry Andric Subject: Re: svn commit: r251689 - head Message-ID: <20130613194243.GA2199@lor.one-eyed-alien.net> References: <201306131826.r5DIQ440060741@svn.freebsd.org> <8B4F57F5-07E3-4D41-8F58-78F605D64D7E@FreeBSD.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="4Ckj6UjgE2iN1+kY" Content-Disposition: inline In-Reply-To: <8B4F57F5-07E3-4D41-8F58-78F605D64D7E@FreeBSD.org> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, Brooks Davis , src-committers@FreeBSD.org X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Jun 2013 19:42:50 -0000 --4Ckj6UjgE2iN1+kY Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Jun 13, 2013 at 08:53:14PM +0200, Dimitry Andric wrote: > On Jun 13, 2013, at 20:26, Brooks Davis wrote: > > Author: brooks > > Date: Thu Jun 13 18:26:04 2013 > > New Revision: 251689 > > URL: http://svnweb.freebsd.org/changeset/base/251689 > >=20 > > Log: > > Be more agressive about bootstrapping ctfmerge and ctfconvert so > > builds from existing releases have a chance of working properly. > >=20 > > Sponsored by: DARPA, AFRL > > MFC after: 3 days > >=20 > > Modified: > > head/Makefile.inc1 > >=20 > > Modified: head/Makefile.inc1 > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D > > --- head/Makefile.inc1 Thu Jun 13 17:13:15 2013 (r251688) > > +++ head/Makefile.inc1 Thu Jun 13 18:26:04 2013 (r251689) > > @@ -1203,8 +1203,8 @@ _clang_tblgen=3D \ > >=20 > > # dtrace tools are required for older bootstrap env and cross-build > > .if ${MK_CDDL} !=3D "no" && \ > > - ((${BOOTSTRAPPING} < 800038 && \ > > - !(${BOOTSTRAPPING} >=3D 700112 && ${BOOTSTRAPPING} < 799999)= ) \ > > + ((${BOOTSTRAPPING} < 1000034 && \ > > + !(${BOOTSTRAPPING} >=3D 901505 && ${BOOTSTRAPPING} < 999999)= ) \ > > || (${MACHINE} !=3D ${TARGET} || ${MACHINE_ARCH} !=3D ${TARGET_AR= CH})) > > _dtrace_tools=3D cddl/usr.bin/sgsmsg cddl/lib/libctf lib/libelf \ > > lib/libdwarf cddl/usr.bin/ctfconvert cddl/usr.bin/ctfmerge >=20 >=20 > Does this fix that kernel builds seem to use /usr/bin/ctfmerge (e.g. > when building on stable/8 or stable/9)? I believe it does. -- Brooks --4Ckj6UjgE2iN1+kY Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (FreeBSD) iD8DBQFRuiCzXY6L6fI4GtQRArqSAKCPFt7YaLu0C94swXSiHrg1hZtj5QCfcedV IfYHpiUYJVd5y2Co0Jr8PWU= =0rx8 -----END PGP SIGNATURE----- --4Ckj6UjgE2iN1+kY--