Date: Sat, 1 Aug 2015 19:34:31 -0700 From: "Simon J. Gerraty" <sjg@juniper.net> To: Baptiste Daroussin <bapt@FreeBSD.org> Cc: <src-committers@FreeBSD.org>, <svn-src-all@FreeBSD.org>, <svn-src-head@FreeBSD.org> Subject: Re: svn commit: r284345 - in head: . bin/cat bin/chflags bin/chio bin/chmod bin/cp bin/csh bin/date bin/dd bin/df bin/domainname bin/echo bin/ed bin/expr bin/freebsd-version bin/getfacl bin/hostname bi... Message-ID: <852.1438482871@chaos> In-Reply-To: <20150726204948.GD1522@ivaldir.etoilebsd.net> References: <201506131920.t5DJKwMH033508@svn.freebsd.org> <20150726204948.GD1522@ivaldir.etoilebsd.net>
next in thread | previous in thread | raw e-mail | index | archive | help
Baptiste Daroussin <bapt@FreeBSD.org> wrote: > This breaks using fmake from ports because of usage of :U in sys.mk Oops - sorry. I saw Warner posted a patch for this which looked ok, but doesn't appear to have been committed. > is compatible with FreeBSD 9 (not that I'm just speaking about sys.mk not other > parts) Understood. AFAICT the following allows fmake to consume sys.mk Index: share/mk/sys.mk =================================================================== --- share/mk/sys.mk (revision 286177) +++ share/mk/sys.mk (working copy) @@ -33,8 +33,10 @@ # early include for customization # see local.sys.mk below -.-include <local.sys.env.mk> +.sinclude <local.sys.env.mk> +.if defined(.PARSEDIR) +# none of this is relevant without bmake .if ${MK_META_MODE} == "yes" .-include <meta.sys.mk> .elif ${MK_META_FILES} == "yes" && ${.MAKEFLAGS:U:M-B} == "" @@ -44,6 +46,7 @@ # This needs to be done early - before .PATH is computed .-include <auto.obj.mk> .endif +.endif # If the special target .POSIX appears (without prerequisites or # commands) before the first noncomment line in the makefile, make shall @@ -361,7 +364,7 @@ .endif # late include for customization -.-include <local.sys.mk> +.sinclude <local.sys.mk> .if defined(__MAKE_SHELL) && !empty(__MAKE_SHELL) SHELL= ${__MAKE_SHELL} @@ -378,11 +381,12 @@ # when running target scripts, this is a problem for many makefiles here. # So define a shell that will do what FreeBSD expects. .ifndef WITHOUT_SHELL_ERRCTL +___MAKE_SHELL?= /bin/sh .SHELL: name=sh \ quiet="set -" echo="set -v" filter="set -" \ hasErrCtl=yes check="set -e" ignore="set +e" \ echoFlag=v errFlag=e \ - path=${__MAKE_SHELL:U/bin/sh} + path=${__MAKE_SHELL} .endif .include <bsd.cpu.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?852.1438482871>