Date: Sat, 17 Dec 2011 16:47:35 +0000 From: Chris Rees <crees@freebsd.org> To: Jan Beich <jbeich@tormail.net> Cc: Christer Solskogen <christer.solskogen@gmail.com>, garga@freebsd.org, freebsd-ports <freebsd-ports@freebsd.org> Subject: Re: Removal of use_gmake breaks lua Message-ID: <CADLo83_6ALN5YyF-E9i_%2Bn8XH-qNeoAfKnYeZcqks3du7Jd8tA@mail.gmail.com> In-Reply-To: <1RbxBi-0008Ls-5O@internal.tormail.net> References: <CAMVU60aj2jZK6NWWpYK=Ub2qhUU4kEdGPKxGqjLyUoSDC%2Bu3Uw@mail.gmail.com> <CADLo8382u95a1BvBZ6SGBTKPjwmCMC2b=QB7xvq31zYMfcY2jA@mail.gmail.com> <1RbxBi-0008Ls-5O@internal.tormail.net>
next in thread | previous in thread | raw e-mail | index | archive | help
On 17 December 2011 16:32, Jan Beich <jbeich@tormail.net> wrote: > Chris Rees <crees@freebsd.org> writes: > >>> as seen here: >>> http://docs.freebsd.org/cgi/getmsg.cgi?fetch=3D295602+0+/usr/local/www/= db/text/2011/cvs-all/20111113.cvs-all >> >> I don't like the proposed solution; it's less hackish to just use >> gmake again; most people have it installed anyway.... > > A non-hackish solution would involve fixing sys.mk to guard against > recursive inclusion of __MAKE_CONF. bsd.port.mk is known to have > this when using make(1) for do-build. > > Not that I mind shoving the issue under the carpet by using gmake. > > Index: share/mk/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 > --- share/mk/sys.mk =A0 =A0 (revision 228500) > +++ share/mk/sys.mk =A0 =A0 (working copy) > @@ -306,10 +306,13 @@ YFLAGS =A0 =A0 =A0 =A0 =A0 =A0?=3D =A0 =A0 =A0-d > =A0 =A0 =A0 =A0${CTFCONVERT_CMD} > > =A0# FreeBSD build pollution. =A0Hide it in the non-POSIX part of the ifd= ef. > +.if !defined(__MAKE_CONF_INCLUDED) > +__MAKE_CONF_INCLUDED=3D > =A0__MAKE_CONF?=3D/etc/make.conf > =A0.if exists(${__MAKE_CONF}) > =A0.include "${__MAKE_CONF}" > =A0.endif > +.endif > > =A0.if defined(__MAKE_SHELL) && !empty(__MAKE_SHELL) > =A0SHELL=3D ${__MAKE_SHELL} Ah now there is a better solution :) I'll see if we can get it in the tree. Thanks, Chris
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CADLo83_6ALN5YyF-E9i_%2Bn8XH-qNeoAfKnYeZcqks3du7Jd8tA>