Date: Mon, 6 Mar 2017 11:19:00 -0800 From: Bryan Drewery <bdrewery@FreeBSD.org> To: rgrimes@freebsd.org, Ian Lepore <ian@freebsd.org> Cc: Warner Losh <imp@bsdimp.com>, 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: <6e319063-5c93-0d70-766c-afabcf23c058@FreeBSD.org> In-Reply-To: <a8af8354-2911-a895-2c16-5048f3e2345c@FreeBSD.org> References: <201703061915.v26JFSSd089794@pdx.rh.CN85.dnsmgr.net> <a8af8354-2911-a895-2c16-5048f3e2345c@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --w1s139qaHobTTcajg6WKFnLApMpx9uJjH Content-Type: multipart/mixed; boundary="lDsgCvONPNQuQmSQfVvHaCgd25p01unxD"; protected-headers="v1" From: Bryan Drewery <bdrewery@FreeBSD.org> To: rgrimes@freebsd.org, Ian Lepore <ian@freebsd.org> Cc: Warner Losh <imp@bsdimp.com>, 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> Message-ID: <6e319063-5c93-0d70-766c-afabcf23c058@FreeBSD.org> Subject: Re: svn commit: r314709 - head References: <201703061915.v26JFSSd089794@pdx.rh.CN85.dnsmgr.net> <a8af8354-2911-a895-2c16-5048f3e2345c@FreeBSD.org> In-Reply-To: <a8af8354-2911-a895-2c16-5048f3e2345c@FreeBSD.org> --lDsgCvONPNQuQmSQfVvHaCgd25p01unxD Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable On 3/6/17 11:17 AM, Bryan Drewery wrote: > On 3/6/17 11:15 AM, Rodney W. Grimes wrote: >> [ Charset ISO-8859-1 unsupported, converting... ] >>> On Mon, 2017-03-06 at 10:32 -0800, Rodney W. Grimes wrote: >>>> [ Charset ISO-8859-1 unsupported, converting... ] >>>>> >>>>> 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 >>>>>>>> =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??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=3D???????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. >>>> One way around this is to use the old concept of /usr/include >>>> symlinks >>>> into the src tree, not sure if you can still do that or not, but >>>> something like >>>> (cd /usr/src/include; make install SHARED=3Dsymlinks) >>>> >>>> A bootstrapping regresssion test I use to run was to rm -r >>>> /usr/include/* >>>> before a buildworld run, that would find these issues so they could >>>> be fixed before they become forgotten. >>>> ? >>> >>> Making my live 10-stable system's /usr/include have symlinks into a 1= 1- >>> or 12- source tree is just not an option in any way. ?The first >>> question would be "which source tree" because I have like a dozen of >>> them, not a single one of them rooted at /usr/src (which is an empty >>> dir). >> >> I dont know that the support of CUrrent -2 building -current with >> a bootstraping include issue is ever going to be workable. You >> could try to build a proper include tree someplace to use, this >> can be done with >> (cd; usr/src/include; make install DESTDIR=3D/my/new/tree) This >> well not touch your /usr/include, but give you a proper include tree, >> now the work is to get buildworld to use that include tree. >> >> If buildworld has degnerated to using stuff out of /usr/include >> that also needs to be fixed ASAP. >> >=20 > buildworld using /usr/include is an intended feature to support > cross-building and running tools in the build that interface with the > current kernel and not the kernel being built. I go over the various phases of the build and the bootstrapping involved at http://www.bsdcan.org/2016/schedule/events/716.en.html >=20 >>> >>> This can't be the first time in 30+ years that system header files ha= d >>> to participate in the process of bootstrapping early build tools, but= I >>> don't see any machinery in Makefile.inc1 for dealing with it. >> >> Happens often, hence why I had that regression test. But bootstrappi= ng >> on Current-2 has never been supported and probably never well be suppo= rted. >> >> >>> -- Ian >> >=20 >=20 --=20 Regards, Bryan Drewery --lDsgCvONPNQuQmSQfVvHaCgd25p01unxD-- --w1s139qaHobTTcajg6WKFnLApMpx9uJjH Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQEcBAEBCgAGBQJYvbYkAAoJEDXXcbtuRpfPNMgIAKbak3pPZK3STf+1AYw6jL2v OyPDIFA9UUsdA2Ag+tuYa2v7nmaMrAxlWlFe7VImPApJxokpKLgACZVilJlEuYsF N0jP+X6ekOKhW/6x/HtULHENh5ynOscdeXePf2P3LEhLigs31I/25Un2WybNrJBP TGzjwxv9qM4qP69qu+Oe+xI58AM9vOh7J/gT6xKJFE9nz+c6UVf13c8EsRY48+0H 0BW48MoaGGJp4ymcdU6Dc/weGroGE5MXosH4+FNETSXQeWjPZjmgyK+5pHP4awrN fNf/bvwaKFC7OlnpmPTezW/vfaIinxwXQBYSTLgnCxQhqMJvEm8NTkmx9kEAMrY= =MlEV -----END PGP SIGNATURE----- --w1s139qaHobTTcajg6WKFnLApMpx9uJjH--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6e319063-5c93-0d70-766c-afabcf23c058>