Removal of use_gmake breaks lua
Jan Beich
jbeich at tormail.net
Sat Dec 17 17:41:23 UTC 2011
Chris Rees <crees at 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}
More information about the freebsd-ports
mailing list