Baptiste Daroussin <b...@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>
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
