Date: Sat, 20 Jun 2015 16:57:07 -0600 From: Warner Losh <imp@bsdimp.com> To: "Simon J. Gerraty" <sjg@FreeBSD.org> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r284650 - head/share/mk Message-ID: <93269D94-59D9-4643-9EE1-12B3A78A3B00@bsdimp.com> In-Reply-To: <201506202148.t5KLm7hI091030@svn.freebsd.org> References: <201506202148.t5KLm7hI091030@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--Apple-Mail=_D055BF88-ED9B-485C-BC84-7850938303FD Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On Jun 20, 2015, at 3:48 PM, Simon J. Gerraty <sjg@FreeBSD.org> wrote: >=20 > Author: sjg > Date: Sat Jun 20 21:48:07 2015 > New Revision: 284650 > URL: https://svnweb.freebsd.org/changeset/base/284650 >=20 > Log: > Deal with MAKEOBJDIRPREFIX >=20 > MAKEOBJDIRPREFIX does not really fit our model. > Use it to set OBJROOT to about where user expects > and set MAKEOBJDIR to do what we want. >=20 > Modified: > head/share/mk/local.meta.sys.mk >=20 > Modified: head/share/mk/local.meta.sys.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/local.meta.sys.mk Sat Jun 20 20:54:05 2015 = (r284649) > +++ head/share/mk/local.meta.sys.mk Sat Jun 20 21:48:07 2015 = (r284650) > @@ -8,6 +8,18 @@ > MK_INSTALL_AS_USER=3D yes >=20 > .if empty(OBJROOT) || ${.MAKE.LEVEL} =3D=3D 0 > +.if defined(MAKEOBJDIRPREFIX) && exists(${MAKEOBJDIRPREFIX}) > +.warning MAKEOBJDIRPREFIX not supported; setting MAKEOBJDIR... > +# put things approximately where they want > +OBJROOT:=3D${MAKEOBJDIRPREFIX}${SRCTOP:S,/src,,}/ > +# OBJTOP set below > +MAKEOBJDIR=3D$${.CURDIR:S,$${SRCTOP},$${OBJTOP},} > +MAKEOBJDIRPREFIX=3D > +# export but do not track > +.export-env MAKEOBJDIRPREFIX MAKEOBJDIR > +# now for our own use > +MAKEOBJDIR=3D ${.CURDIR:S,${SRCTOP},${OBJTOP},} > +.endif > .if !empty(SB) > SB_OBJROOT ?=3D ${SB}/obj/ > # this is what we use below MAKEOBJDIRPREFIX has been *THE* way to do things in FreeBSD since = ~forever. How does it not fit our model? It is our model. This change is ill = advised. Also, this change will generate about a billion warnings for a = buildworld (one per makefile, per tree traverse). That=E2=80=99s not acceptable. Warner --Apple-Mail=_D055BF88-ED9B-485C-BC84-7850938303FD Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQIcBAEBCgAGBQJVhe/EAAoJEGwc0Sh9sBEAp74P/0rVGgYROcgdeMWX9nfzmi0S tduM7XOOuGu93x/bnQ3drNNWlRWzC2gFFmybx26qvMcJYht/35RosQ+WdXUwlJhn 6SXigz4dGDS5lCe6sr6RNb0d+qOeS5MCLCB0U/Vsp4AYSkiFki9eak987as7KbNF Hyqm1ch+1dL1gJ1g0hb9T5AHPrl4YRR5546HzTwZEGqDmR5APtWLpqs8yzX+/uDh ADUQX6FG1Qjfwf5woGcs2ZJGU+LheZaiySvSlAxXlQzIQb2sWUoeaE1aypyuUEsE +2yzpivDU4Y8jWjL29yhzgt9Z2utdOjq1CNL3JDLIkg12sC8X4EzL9De0H+Z0Qsh WtVGAvsvuH6NS9Fae2CpzI2Gik3MQa5KmhHKr0Jrs21rUCTqoQI30kDbunrWYbXp +0CoUcXlUzLGjuW+T5WVWZJZkIlddtyL5XOvbrupUPZA9cfhHb672MLf0FnmddaM xcfpxxgRT1Lk4U4d2inWjtVHd+Lkphg0xDMtp+gFOPB31P6Aml+k9xT0Jepi5en4 PWtAo3V2KXx7PV7jRWWWS8Hi9m29K+6gw5BpwbJPoD3u6rL3+fYvdgzTKdyMGNct OAPy74v2Z+0+9RkyCEEVZEt/i0NT79Om0Vk8FKKbtuiNC2FFKfR8fTC+upYfWfXF oz5fTH1mrI2a1pkZ+dqb =Sk0s -----END PGP SIGNATURE----- --Apple-Mail=_D055BF88-ED9B-485C-BC84-7850938303FD--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?93269D94-59D9-4643-9EE1-12B3A78A3B00>