Date: Thu, 15 Oct 2015 14:18:05 -0700 From: Bryan Drewery <bdrewery@FreeBSD.org> To: Ian Lepore <ian@freebsd.org>, src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r289384 - head/lib Message-ID: <5620180D.5010206@FreeBSD.org> In-Reply-To: <1444942810.71631.3.camel@freebsd.org> References: <201510152027.t9FKRFgT031177@repo.freebsd.org> <5620127C.9070409@FreeBSD.org> <1444942810.71631.3.camel@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) --P51kRJtLk4pJGMQoASnWCN7lLvlQWNK3u Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable On 10/15/2015 2:00 PM, Ian Lepore wrote: > On Thu, 2015-10-15 at 13:54 -0700, Bryan Drewery wrote: >> On 10/15/2015 1:27 PM, Bryan Drewery wrote: >>> Author: bdrewery >>> Date: Thu Oct 15 20:27:15 2015 >>> New Revision: 289384 >>> URL: https://svnweb.freebsd.org/changeset/base/289384 >>> >>> Log: >>> Let the SUBDIR_DEPEND*c++ variables actually work rather than >>> being parsed >>> as a +=3D. These were safe due to a .WAIT very early on. >>> =20 >> >> My analysis was wrong. The libc++ dependency on libcxxrt was actually >> broken here and would not have built if you went directly into lib >> and >> built in parallel. It was hidden by the fact that a proper dependency >> is >> in Makefile.inc1 via an __L target. The power of redundancy! >> >> This too allows kerberos5/lib to work with SUBDIR_PARALLEL=3D since >> it's >> so greatly defined in Makefile.inc1. >> >> >=20 > But don't both sets of dependencies have to be correct? As I vaguely > recall, the ones in Makefile.inc1 are used during bootstrapping and > tool building, and the ones in lib/Makefile are used when world > -building. It may be that when MACHINE_ARCH =3D=3D TARGET_ARCH some of= > them are the same libraries and the Makefile.inc1 dependencies take > care of everything. It's complicated, my words may seem to contradict but it's just the nature of the convoluted process that we bootstrap the build by. Libraries, and anything else we list in the bootstrap phases, are special. Their SUBDIR_depend are less needed in the context of buildworld since they will already be built by the time the 'make libraries' builds all of lib/ with a subdir build or the 'make all' is ran on the tree, because of the __L dependencies. The special bootstrap phase stuff and special libraries need to have all of the proper __L targets to order them as they are built directly, not via bsd.subdir.mk recursing. One of the last steps of 'make libraries' does do a subdir build in lib/ since _generic_libs contains 'lib'. So yes the SUBDIR_depend are relevant for buildworld, but getting it wrong can be fine in cases where the library was built early with proper __L deps list= ed. The SUBDIR_depend are needed for manual direct subdir builds outside of buildworld and the builds 'make libraries' and 'make all' phases which use subdir builds to build things lacking a __L list. I've noticed that when people add new libraries into the early phases they usually follow-up with multiple commits trying to get it all right and update all of the proper places. Note that we actually have a 3rd dependency list in the tree now which is in the scattered Makefile.depend files. These are used for "meta mode" which I do think is more on the right track as it lets a clean build start from any directory. It doesn't use the SUBDIR_depend or the __L lists at all. The problem with it is the auto-generated nature of it can lead to problems with optional dependencies and adding new directories. --=20 Regards, Bryan Drewery --P51kRJtLk4pJGMQoASnWCN7lLvlQWNK3u Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBAgAGBQJWIBgNAAoJEDXXcbtuRpfPeEwIAIZ11UJimCfSZ6pCJzZECubN QrG4ilQglxbBXkjQxAumE2uG3WwSCQUQvboPGE1zcBjaPIcj20Kh01dARynPIWAY 6C8hARolZZuogbKnA+2nHDkx9yO2xKF+Aa+qFhdsMqKFrSpeeovjU9IvjzB1mrZs tAxuFpu7h0e8DqI3hbydj4YL6kjaMgl4G2bsui4h4Q0T89Q0nEoLwnqJYAfEfgkW qVCCx9snreBJKkmGuv2FKgOzJktLqAeMeJvVpSGJjULQC8bCGGib93fYYIyyFBdY 1sEdwjck0xtMV85VpRrqLZy9BDn+LJBhlaujPQ+CH7Pktuj37IDcsXR5F1eIvZ0= =WeWj -----END PGP SIGNATURE----- --P51kRJtLk4pJGMQoASnWCN7lLvlQWNK3u--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?5620180D.5010206>