Date: Mon, 06 Mar 2017 11:20:15 -0700 From: Ian Lepore <ian@freebsd.org> To: Bryan Drewery <bdrewery@FreeBSD.org>, Warner Losh <imp@bsdimp.com> Cc: src-committers <src-committers@freebsd.org>, "svn-src-all@freebsd.org" <svn-src-all@freebsd.org>, "svn-src-head@freebsd.org" <svn-src-head@freebsd.org> Subject: Re: svn commit: r314709 - head Message-ID: <1488824415.18764.30.camel@freebsd.org> In-Reply-To: <55159e24-f318-dd61-fe13-c340826fe006@FreeBSD.org> References: <201703052116.v25LGoEv072414@repo.freebsd.org> <CANCZdfpPaMzuP_6UMFUF8xjU=8Ne4CrmcBWyXe9-e-R5fVeRYA@mail.gmail.com> <55159e24-f318-dd61-fe13-c340826fe006@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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 <bdrewery@freebsd.org > > > 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1488824415.18764.30.camel>