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...

[Craig Rodrigues]

On Sat, Jun 13, 2015 at 3:34 PM, Craig Rodrigues <rodrigc at freebsd.org>
wrote:
>
> On Sat, Jun 13, 2015 at 12:20 PM, Simon J. Gerraty <sjg at freebsd.org>
wrote:
>>
>> Author: sjg
>> Date: Sat Jun 13 19:20:56 2015
>> New Revision: 284345
>> URL: https://svnweb.freebsd.org/changeset/base/284345
>>
>> Log:
>>   Add META_MODE support.
>
>
> Simon,
>
> Can you take a look at this:
> https://jenkins.freebsd.org/job/FreeBSD_HEAD/2860/
>
>
> The console output is showing this:
>
> + make -j 4 buildworld __MAKE_CONF=/builds/FreeBSD_HEAD/make.conf
> make: "/builds/FreeBSD_HEAD/Makefile" line 102: Malformed conditional
(${MK_META_MODE} == "yes")
> make: Fatal errors encountered -- cannot continue
> make: stopped in /builds/FreeBSD_HEAD
> Build step 'Execute shell' marked build as failure
>
> This is using a FreeBSD 10.1 host to build HEAD.
>

 I can reproduce the problem pretty quickly.
I did this on a FreeBSD-CURRENT host:

# svn co svn://svn.freebsd.org/base/head src
# cd src
# make -V MK_META_MODE
no

I did this on a FreeBSD 10.1-R host:

# svn co svn://svn.freebsd.org/base/head src
# cd src
# make -V MK_META_MODE
make: "/root/src/Makefile" line 102: Malformed conditional (${MK_META_MODE}
== "yes")
make: Fatal errors encountered -- cannot continue
make: stopped in /root/src

FreeBSD 10.1 is using bmake as /usr/bin/make so fmake is not an issue here.
I think the issue is that on FreeBSD 10.1, the /usr/share/mk files do
not have the logic to define MK_META_MODE.

I am not sure if this is the right fix, but I did this:

Index: Makefile
===================================================================
--- Makefile (revision 284374)
+++ Makefile (working copy)
@@ -99,7 +99,7 @@
 #
 # For more information, see the build(7) manual page.
 #
-.if ${MK_META_MODE} == "yes"
+.if !empty(MK_META_MODE) && ${MK_META_MODE} == "yes"
 # targets/Makefile plays the role of top-level
 .include "targets/Makefile"
 .else


and that made things work for me on FreeBSD 10.1-R.

--
Craig