Date: Sun, 18 Dec 2011 03:32:09 +1100 From: Jan Beich <jbeich@tormail.net> To: Chris Rees <crees@freebsd.org> 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: <1RbxBi-0008Ls-5O@internal.tormail.net> In-Reply-To: <CADLo8382u95a1BvBZ6SGBTKPjwmCMC2b=QB7xvq31zYMfcY2jA@mail.gmail.com> (Chris Rees's message of "Sat, 17 Dec 2011 15:52:07 %2B0000") References: <CAMVU60aj2jZK6NWWpYK=Ub2qhUU4kEdGPKxGqjLyUoSDC%2Bu3Uw@mail.gmail.com> <CADLo8382u95a1BvBZ6SGBTKPjwmCMC2b=QB7xvq31zYMfcY2jA@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
Chris Rees <crees@freebsd.org> writes: >> as seen here: >> http://docs.freebsd.org/cgi/getmsg.cgi?fetch=295602+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 =================================================================== --- share/mk/sys.mk (revision 228500) +++ share/mk/sys.mk (working copy) @@ -306,10 +306,13 @@ YFLAGS ?= -d ${CTFCONVERT_CMD} # FreeBSD build pollution. Hide it in the non-POSIX part of the ifdef. +.if !defined(__MAKE_CONF_INCLUDED) +__MAKE_CONF_INCLUDED= __MAKE_CONF?=/etc/make.conf .if exists(${__MAKE_CONF}) .include "${__MAKE_CONF}" .endif +.endif .if defined(__MAKE_SHELL) && !empty(__MAKE_SHELL) SHELL= ${__MAKE_SHELL}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1RbxBi-0008Ls-5O>