From owner-svn-src-head@freebsd.org Mon Mar 6 18:20:23 2017 Return-Path: Delivered-To: svn-src-head@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 DA9F1CFBE06 for ; Mon, 6 Mar 2017 18:20:23 +0000 (UTC) (envelope-from ian@freebsd.org) Received: from outbound1b.ore.mailhop.org (outbound1b.ore.mailhop.org [54.200.247.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BE76512DD for ; Mon, 6 Mar 2017 18:20:23 +0000 (UTC) (envelope-from ian@freebsd.org) X-MHO-User: 9e170be4-0299-11e7-ba57-8bc134ee460a X-Report-Abuse-To: https://support.duocircle.com/support/solutions/articles/5000540958-duocircle-standard-smtp-abuse-information X-Originating-IP: 73.78.92.27 X-Mail-Handler: DuoCircle Outbound SMTP Received: from ilsoft.org (unknown [73.78.92.27]) by outbound1.ore.mailhop.org (Halon) with ESMTPSA id 9e170be4-0299-11e7-ba57-8bc134ee460a; Mon, 06 Mar 2017 18:20:46 +0000 (UTC) Received: from rev (rev [172.22.42.240]) by ilsoft.org (8.15.2/8.15.2) with ESMTP id v26IKFfS001221; Mon, 6 Mar 2017 11:20:15 -0700 (MST) (envelope-from ian@freebsd.org) Message-ID: <1488824415.18764.30.camel@freebsd.org> Subject: Re: svn commit: r314709 - head From: Ian Lepore To: Bryan Drewery , Warner Losh Cc: src-committers , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Date: Mon, 06 Mar 2017 11:20:15 -0700 In-Reply-To: <55159e24-f318-dd61-fe13-c340826fe006@FreeBSD.org> References: <201703052116.v25LGoEv072414@repo.freebsd.org> <55159e24-f318-dd61-fe13-c340826fe006@FreeBSD.org> Content-Type: text/plain; charset="ISO-8859-1" X-Mailer: Evolution 3.18.5.1 FreeBSD GNOME Team Port Mime-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 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: Mon, 06 Mar 2017 18:20:24 -0000 On Sun, 2017-03-05 at 19:12 -0800, Bryan Drewery wrote: > On 3/5/17 3:41 PM, Warner Losh wrote: > > > > On Sun, Mar 5, 2017 at 2:16 PM, Bryan Drewery > > wrote: > > > > > > Author: bdrewery > > > Date: Sun Mar  5 21:16:50 2017 > > > New Revision: 314709 > > > URL: https://svnweb.freebsd.org/changeset/base/314709 > > > > > > Log: > > >   Fix bootstrapping mtree after r313404 for older systems. > > > > > >   r313404 made libnetbsd require sha384.h from libmd.  Libmd > > > added it in > > >   r292782.  Update BOOTSTRAPPING to account for this. > > > > > >   Reported by:  bde > > >   Reviewed by:  ngie > > > > > > Modified: > > >   head/Makefile.inc1 > > > > > > Modified: head/Makefile.inc1 > > > ================================================================= > > > ============= > > > --- head/Makefile.inc1  Sun Mar  5 19:56:20 2017        (r314708) > > > +++ head/Makefile.inc1  Sun Mar  5 21:16:50 2017        (r314709) > > > @@ -1618,10 +1618,12 @@ ${_bt}-usr.bin/m4: ${_bt}-lib/libopenbsd > > >  ${_bt}-usr.bin/lex: ${_bt}-usr.bin/m4 > > >  .endif > > > > > > -.if ${BOOTSTRAPPING} < 1000026 > > > -_nmtree=       lib/libnetbsd \ > > I've been trying to document the bootstrapping stuff inline like > > > > # r313404 made libnetbsd require libmd > Definitely.  I forgot about that.  I think my change is incomplete > and > need to chase down a 2nd failure report.  I'll add the comment once > that > is figured out. > I tracked this down to the fact that the prototype   char * MD5FileChunk(const char *, char *, off_t, off_t); does not exist in /usr/include/sys/md5.h on older systems.  I don't see any straightforward way to declare that a header file from the /usr/include hierarchy is a bootstrap item that needs a newer version from the source tree being compiled.  It looks like such a header would have to go into the obj/.../tmp/legacy/usr/include to get used in the boostrap compile, I just don't see how you get a file installed there early enough in bootstrap. -- Ian