From owner-svn-src-head@freebsd.org Thu Oct 15 21:00:13 2015 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 B03F4A16F36 for ; Thu, 15 Oct 2015 21:00:13 +0000 (UTC) (envelope-from ian@freebsd.org) Received: from pmta2.delivery6.ore.mailhop.org (pmta2.delivery6.ore.mailhop.org [54.200.129.228]) (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 8E50F972 for ; Thu, 15 Oct 2015 21:00:13 +0000 (UTC) (envelope-from ian@freebsd.org) Received: from ilsoft.org (unknown [73.34.117.227]) by outbound2.ore.mailhop.org (Halon Mail Gateway) with ESMTPSA; Thu, 15 Oct 2015 21:00:19 +0000 (UTC) Received: from rev (rev [172.22.42.240]) by ilsoft.org (8.14.9/8.14.9) with ESMTP id t9FL0A3k001896; Thu, 15 Oct 2015 15:00:10 -0600 (MDT) (envelope-from ian@freebsd.org) Message-ID: <1444942810.71631.3.camel@freebsd.org> Subject: Re: svn commit: r289384 - head/lib From: Ian Lepore To: Bryan Drewery , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Date: Thu, 15 Oct 2015 15:00:10 -0600 In-Reply-To: <5620127C.9070409@FreeBSD.org> References: <201510152027.t9FKRFgT031177@repo.freebsd.org> <5620127C.9070409@FreeBSD.org> Content-Type: text/plain; charset="us-ascii" X-Mailer: Evolution 3.16.5 FreeBSD GNOME Team Port Mime-Version: 1.0 Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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, 15 Oct 2015 21:00:13 -0000 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 +=. These were safe due to a .WAIT very early on. > > > > 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= since > it's > so greatly defined in Makefile.inc1. > > 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 == TARGET_ARCH some of them are the same libraries and the Makefile.inc1 dependencies take care of everything. -- Ian > > -SUBDIR_DEPEND_libc++= libcxxrt > > +SUBDIR_DEPEND_libc++:= libcxxrt > > SUBDIR_DEPEND_libc= libcompiler_rt > > SUBDIR_DEPEND_libcam= libsbuf > > SUBDIR_DEPEND_libcapsicum= libnv > > @@ -148,7 +148,7 @@ SUBDIR_DEPEND_libpjdlog= libutil > >