From owner-svn-src-all@freebsd.org Tue Oct 6 20:00:56 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 E54889D0A8A; Tue, 6 Oct 2015 20:00:55 +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 C7CAAA48; Tue, 6 Oct 2015 20:00:55 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [IPv6:::1]) by freefall.freebsd.org (Postfix) with ESMTP id C071F1AD3; Tue, 6 Oct 2015 20:00:55 +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 50E9E10938; Tue, 6 Oct 2015 20:00:55 +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 Y6XMx8AKgEtW; Tue, 6 Oct 2015 20:00:48 +0000 (UTC) Subject: Re: svn commit: r288911 - head/share/mk DKIM-Filter: OpenDKIM Filter v2.9.2 mail.xzibition.com 5E07710931 To: "Simon J. Gerraty" References: <201510060418.t964Innu071170@repo.freebsd.org> <56140CAD.8080200@FreeBSD.org> <15356.1444161040@chaos> Cc: Warner Losh , 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: <5614286D.7020904@FreeBSD.org> Date: Tue, 6 Oct 2015 13:00:45 -0700 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: <15356.1444161040@chaos> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="OGfbECOx08J1i4lG9e2WJXTm87D7JQfv4" 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: Tue, 06 Oct 2015 20:00:56 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --OGfbECOx08J1i4lG9e2WJXTm87D7JQfv4 Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable On 10/6/2015 12:50 PM, Simon J. Gerraty wrote: > Bryan Drewery wrote: >> Why would anyone build ports in a sub-dir of src? It's convenient for = a >> vendor building their own product that needs their own ports tree. So= me >> decisions can't easily be changed; if the root of the source code >> checkout is already src/, there is no simple way to avoid the problem.= >=20 > But wouldn't that imply that /usr/src/share/mk is the right set of > makefiles to use for /usr/src/ports/ >=20 > What would you consider the right sys.mk etc would be in such a case? >=20 For our case we want the checked in src/share/mk to be used rather than the older /usr/share/mk as it is easier to support. If there's a problem we fix in our local.sys.env.mk or bsd.port.mk for instance, it will be used by updating the checkout. This was something we backported, without the src.conf inclusion in sys.mk, and were running with fine. Excluding src.conf is enough to satisfy our needs as it prevents a lot of extra environment, variables, and target overrides we have added into our src.conf to avoid touching FreeBSD files where possible. The biggest problem I hit so far was some LOCAL_LIBRARIES we added in that needed their own __L targets in our src.conf, which bleed into non-src builds now and cause obscure errors. Modifying CFLAGS is another that we have a separate src.conf and ports_make.conf value for, with a shared make.con= f. The changes made by including src.*.mk have not been a problem for us so far. There's really not much hidden from /usr/share/mk except some src-only option handling and library lists. It's possible the inclusion of the meta mode "src".*.mk files could cause problems for us, but I haven't investigated it yet. My biggest problem here is that lack of _WITHOUT_SRCCONF support in bsd.port.mk. The nested build of a non-src build in src/ is easily handled by a -m argument, or using gmake as the upstream was expecting it to be anyhow. In the case we've hit this we have a BSD Makefile that calls the upstream build, so we can control what make arguments and other environment are done from there. However, a user going into src/ports and typing 'make' will get the src.conf pulled in with other surprises. --=20 Regards, Bryan Drewery --OGfbECOx08J1i4lG9e2WJXTm87D7JQfv4 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 iQEcBAEBAgAGBQJWFChtAAoJEDXXcbtuRpfPHNQH/0ZI7n7+TsIZ/gsLpRoVwvtd Q9b2eRjyPoe38ZzSKHEzk0EJKPHsfoqY0ilnWn/LPlFMR6ENJ46O5g/uXGR7jnTj llTNk1VyGPpECmgFpk3lhbCB/tvK+JDmGA+/mP9hYmG0yMiTJTZoc8IHeWo2ww9z 7EqEvhAoMlEoHcvA6GbyHP/rD3ebUh6u9IKlAmzzTKHISDulc+f87lJatoTfEUPa fo19QMWsByYEN4rVyk8rtl4q53jJ5RWa2NqP0X1nnk+JdnrYam6cFrjjeZnzdXD4 GSCJGmD1Qwu4NM4I/PexaA92AdJXmlcsf8skKyyhVZnLKN8imbYJHK7JwLoqT6I= =ZmYX -----END PGP SIGNATURE----- --OGfbECOx08J1i4lG9e2WJXTm87D7JQfv4--