Date: Sat, 18 Nov 2017 12:07:43 -0800 From: Bryan Drewery <bdrewery@FreeBSD.org> To: "O. Hartmann" <ohartmann@walstatt.org> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r325974 - in head: . share/mk Message-ID: <305f90ef-da9c-3181-2e14-666267b29974@FreeBSD.org> In-Reply-To: <20171118210629.7dde2e64@thor.intern.walstatt.dynvpn.de> References: <201711182001.vAIK1FHh002172@repo.freebsd.org> <20171118210629.7dde2e64@thor.intern.walstatt.dynvpn.de>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --88vbqteAHXpAtuHEt4FsHxIv1IxSrltX8 Content-Type: multipart/mixed; boundary="aHhtJDKic3uRWePaBfipIHw2uR3bslMLG"; protected-headers="v1" From: Bryan Drewery <bdrewery@FreeBSD.org> To: "O. Hartmann" <ohartmann@walstatt.org> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-ID: <305f90ef-da9c-3181-2e14-666267b29974@FreeBSD.org> Subject: Re: svn commit: r325974 - in head: . share/mk References: <201711182001.vAIK1FHh002172@repo.freebsd.org> <20171118210629.7dde2e64@thor.intern.walstatt.dynvpn.de> In-Reply-To: <20171118210629.7dde2e64@thor.intern.walstatt.dynvpn.de> --aHhtJDKic3uRWePaBfipIHw2uR3bslMLG Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable On 11/18/17 12:06 PM, O. Hartmann wrote: > Am Sat, 18 Nov 2017 20:01:15 +0000 (UTC) > Bryan Drewery <bdrewery@FreeBSD.org> schrieb: >=20 >> Author: bdrewery >> Date: Sat Nov 18 20:01:15 2017 >> New Revision: 325974 >> URL: https://svnweb.freebsd.org/changeset/base/325974 >> >> Log: >> Fix top-level targets with read-only OBJDIR. >> =20 >> This also makes it so that top-level build targets do not immediatel= y create >> the OBJDIR. Only sub-make targets will do so. This avoids creating= object >> directories for targets like 'make check-old' or creating unneeded >> MACHINE.MACHINE_ARCH directories during 'make tinderbox'. >> =20 >> Reported by: npn, lifanov >> Tested by: npn, Mark Millard >> Sponsored by: Dell >> >> Modified: >> head/Makefile.sys.inc >> head/share/mk/src.sys.obj.mk >> >> Modified: head/Makefile.sys.inc >> =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.sys.inc Sat Nov 18 20:01:12 2017 (r325973) >> +++ head/Makefile.sys.inc Sat Nov 18 20:01:15 2017 (r325974) >> @@ -33,6 +33,11 @@ _CAN_USE_AUTO_OBJ?=3D yes >> .if !defined(_CAN_USE_AUTO_OBJ) >> _MAKEARGS+=3D MK_AUTO_OBJ=3Dno >> MK_AUTO_OBJ=3D no >> +# This will prevent src.sys.obj.mk from opportunistically enabling AU= TO_OBJ >> +# in this make execution and for sub-makes. For all of these targets= we >> +# just want to read any existing OBJDIR but we don't care if we can c= reate >> +# or write to them. >> +.MAKEOVERRIDES+=3D MK_AUTO_OBJ >> .endif >> .endif # empty(.MAKEOVERRIDES:MMK_AUTO_OBJ) >> =20 >> >> Modified: head/share/mk/src.sys.obj.mk >> =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/share/mk/src.sys.obj.mk Sat Nov 18 20:01:12 2017 (r325973) >> +++ head/share/mk/src.sys.obj.mk Sat Nov 18 20:01:15 2017 (r325974) >> @@ -19,6 +19,12 @@ >> # TARGET.TARGET_ARCH added in as it assumes that MAKEOBJDIRPREFIX is= >> # nested in the existing OBJTOP with TARGET.TARGET_ARCH in it. >> # >> +# The expected OBJDIR is stored in __objdir for auto.obj.mk to use. >> +# >> +# AUTO_OBJ is opportunistically enabled if the computed .OBJDIR is w= ritable >> +# by the current user. Some top-level targets disable this behavior= in >> +# Makefile.sys.inc. >> +# >> =20 >> _default_makeobjdirprefix?=3D /usr/obj >> _default_makeobjdir=3D $${.CURDIR:S,^$${SRCTOP},$${OBJTOP},} >> _______________________________________________ >> svn-src-head@freebsd.org mailing list >> https://lists.freebsd.org/mailman/listinfo/svn-src-head >> To unsubscribe, send any mail to "svn-src-head-unsubscribe@freebsd.org= " >=20 > Seems to break buildworld: >=20 > [...] >=20 > Updated to revision 325974. > root@walhall:/usr/src # make -j9 buildworld buildkernel > make: "/usr/src/Makefile.sys.inc" line 11: Malformed conditional (${MK_= DIRDEPS_BUILD} =3D=3D > "no") make: Fatal errors encountered -- cannot continue > make: stopped in /usr/src > .ERROR_TARGET=3D'' >=20 Doh, I took out the :Uno at the last minute. Fixing. --=20 Regards, Bryan Drewery --aHhtJDKic3uRWePaBfipIHw2uR3bslMLG-- --88vbqteAHXpAtuHEt4FsHxIv1IxSrltX8 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 iQEzBAEBCgAdFiEE+Rc8ssOq6npcih8JNddxu25Gl88FAloQkxEACgkQNddxu25G l89J0gf/QwXbP3yvYQwYCznHZkR2EkNBtYfJkkGubjk/syOvoO3oS4+hEBBdzJdH ggiStaFydNfI/jAQL77trp2azEP+4hf0X14WdCduWnxPvP+tun/IdIEsYgXjpJhj QdV47WNBzUjlXiW1ByUipQr88Z96CYYmYh8bpeKrrPIxKgBg1Fmu/SkDoXJQpSnS sNYUiGRQQjX2o3SZo7xmsB+otrX9mAHJ3SbHrBHVOfQW0b7Wtq+Kqd/nS2FqSHpI nizrJaFBrEPQpMhhL47LFGudVVxVPipwKQG2tMZWjPQnFsAGtF+p4IjqV/QC8Byk H6V9XxdXj2YEqIkmgNZL+5x2+wL13w== =UsCn -----END PGP SIGNATURE----- --88vbqteAHXpAtuHEt4FsHxIv1IxSrltX8--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?305f90ef-da9c-3181-2e14-666267b29974>