From owner-svn-src-all@freebsd.org Thu Nov 19 01:45:12 2015 Return-Path: Delivered-To: svn-src-all@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 E3288A2F7BA; Thu, 19 Nov 2015 01:45:11 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id C5FDF111B; Thu, 19 Nov 2015 01:45:11 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [IPv6:::1]) by freefall.freebsd.org (Postfix) with ESMTP id BA2C712B7; Thu, 19 Nov 2015 01:45:11 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [172.31.3.2]) by mail.xzibition.com (Postfix) with ESMTP id 1420616BB5; Thu, 19 Nov 2015 01:45:10 +0000 (UTC) X-Virus-Scanned: amavisd-new at mail.xzibition.com Received: from mail.xzibition.com ([172.31.3.2]) by mail.xzibition.com (mail.xzibition.com [172.31.3.2]) (amavisd-new, port 10026) with LMTP id 7CiGvc12c7UG; Thu, 19 Nov 2015 01:45:04 +0000 (UTC) Subject: Re: svn commit: r288966 - head/share/mk DKIM-Filter: OpenDKIM Filter v2.9.2 mail.xzibition.com 9A96316BAF To: "Simon J. Gerraty" References: <201510070032.t970WYvU099368@repo.freebsd.org> <56146B4E.5040401@FreeBSD.org> <24053.1444240925@chaos> <56155FE0.7020809@FreeBSD.org> Cc: src-committers@FreeBSD.org, svn-src-all@FreeBSD.org, svn-src-head@FreeBSD.org From: Bryan Drewery Openpgp: id=F9173CB2C3AAEA7A5C8A1F0935D771BB6E4697CF; url=http://www.shatow.net/bryan/bryan2.asc X-Enigmail-Draft-Status: N1110 Organization: FreeBSD Message-ID: <564D29A0.6040000@FreeBSD.org> Date: Wed, 18 Nov 2015 17:45:04 -0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 In-Reply-To: <56155FE0.7020809@FreeBSD.org> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="dmpsXb8wNAdsRX9RoDdhIhIRBnD8fmou8" X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Nov 2015 01:45:12 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --dmpsXb8wNAdsRX9RoDdhIhIRBnD8fmou8 Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable On 10/7/2015 11:09 AM, Bryan Drewery wrote: > On 10/7/2015 11:02 AM, Simon J. Gerraty wrote: >> Bryan Drewery wrote: >>>> +.for h in ${SRCS:M*.h} >>> >>> I think we can use DPSRCS as well for this. >> >> Not sure. >> usr.bin/truss/Makefile didn't use that. >> I only see it set in bsd.dep.mk - which we don't use in meta mode. >> >=20 > I'm less thinking about the usage in bsd.dep.mk and more these that > manually set it: >=20 > gnu/lib/libreadline/readline/Makefile:DPSRCS+=3D ${INSTALLED_HEADERS} > lib/libc/tests/rpc/Makefile:DPSRCS+=3D h_testbits.h > sbin/ipf/ipf/Makefile:DPSRCS+=3D ${GENHDRS} > sbin/ipf/ipftest/Makefile:DPSRCS+=3D ${GENHDRS} > sbin/ipf/ipmon/Makefile:DPSRCS+=3D ${GENHDRS} > sbin/ipf/ipnat/Makefile:DPSRCS+=3D ${GENHDRS} > sbin/ipf/ippool/Makefile:DPSRCS+=3D ${GENHDRS} > sys/modules/linux/Makefile:DPSRCS=3D linux${SFX}_genassym.c > sys/modules/linux64/Makefile:DPSRCS=3D linux_genassym.c > sys/modules/vmm/Makefile:DPSRCS=3D vmx_genassym.c svm_genassym.c= > usr.bin/kdump/Makefile:DPSRCS=3D kdump_subr.h > usr.bin/netstat/Makefile:DPSRCS=3D nl_defs.h > usr.bin/svn/svn/Makefile:DPSRCS+=3D freebsd-organization.h >=20 >=20 > I ran into at least one case, I think usr.bin/netstat, where the file i= n > DPSRCS was missing and Makefile.depend had to learn how to build it > before it would work. >=20 > I can test more to see if adding it has any effect. >=20 Actually, all but the sys/ ones here are wrongly using DPSRCS and should be SRCS. I have pending commits to fix that. DPSRCS is *only for files used to generate other files, not generated files*. Fixing these DPSRCS cases fixes the "clean build" in usr.bin/netstat for example (without the local deps in Makefile.depend). Really, anything that fails to build with "missing local dependencies" is broken outside of the meta build as well. As for the actual change in local.autodep.mk, I don't think it is needed or right since bsd.lib.mk and bsd.prog.mk already do exactly the same thing via ${OBJS}: ${SRCS:M*.h} if .depend is not yet generated. This does work in meta mode as I ran into a failure due to it before r291046 (I had removed the libbfd/Makefile.depend.host for other testing). It's also hooked in far too late and orthogonally to the OBJS in the graph that need the headers. --=20 Regards, Bryan Drewery --dmpsXb8wNAdsRX9RoDdhIhIRBnD8fmou8 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 iQEcBAEBAgAGBQJWTSmgAAoJEDXXcbtuRpfPBXUH/jn/unMhFx+h++hXUnjcvFyj f/ZaFI6+dHC9x15OYdqry8GFrcTADOkqcyOFMkRovVOlZIP3mlZ0WQeF4d2slPNU Q6tA3R6guSSYpKRZG/Ej3RlrjSXzy6JKP9FjkTZsJSEdH4DyEKAuTjX/pBEEWIFc 5YM0aSAiSU16WKVwbk4cOxJolBphx0qnPQlubae8l+zCCV7gr01egcxcth0nQAzx 64aWtK4Bk/VrxNJ2rZo3cB+Gkj2C2KVI5+SUw0ABh6maYvBmCmexYcJvRKtQNIUF vjiLSzIcHfO5uRSngxzMsmKHZqey9VsFxKfuEEocc7fdODl+JIC/LC4YzKtP888= =Remo -----END PGP SIGNATURE----- --dmpsXb8wNAdsRX9RoDdhIhIRBnD8fmou8--