From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 04:46:30 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AC161716; Sun, 14 Jun 2015 04:46:30 +0000 (UTC) (envelope-from crodr001@gmail.com) Received: from mail-yh0-x235.google.com (mail-yh0-x235.google.com [IPv6:2607:f8b0:4002:c01::235]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 66442EAB; Sun, 14 Jun 2015 04:46:30 +0000 (UTC) (envelope-from crodr001@gmail.com) Received: by yhpn97 with SMTP id n97so26210263yhp.0; Sat, 13 Jun 2015 21:46:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; bh=1cS6sFMLkimLZozQp5mymp7wQguJ9Qk/FwIHxAmoRwI=; b=WTqWEW6NVSIw7FwTb0BfCKNEMwHxCsU/RzRrF5ym3JwrZ/jYu/RoFBjkX489ELq6Fx VyA/z7ov9mfycItgsCGX4GNiv5HMQuWFlJTmQCldMiRa2ajy07L6isqMMYvB3N0Bop0o FTZQJIUdkPJgYSNgTEz+4pJ+aupRLO7fXm3xpJgh7FS9wQ5V6WT93XYHyb7MVSN8L6ou JNSILSJWyvpUqNsBhQV4lpKVaY+ylwctU/1GS5XV1SQDfoRl8nA9bUyQBpU4za6KXYiO b5M3GOFtJzT90m5PAoMq5b1vjeEULFMb1ygYxA5dLGTVVQ+q0tyYoS4Q0lCEipIxWgqD PgLA== MIME-Version: 1.0 X-Received: by 10.13.232.8 with SMTP id r8mr840364ywe.167.1434257189526; Sat, 13 Jun 2015 21:46:29 -0700 (PDT) Sender: crodr001@gmail.com Received: by 10.37.39.130 with HTTP; Sat, 13 Jun 2015 21:46:29 -0700 (PDT) In-Reply-To: References: <201506131920.t5DJKwMH033508@svn.freebsd.org> Date: Sat, 13 Jun 2015 21:46:29 -0700 X-Google-Sender-Auth: iiXXkG9TvJ_nVi5X3NMJ7LeZywM Message-ID: 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... From: Craig Rodrigues To: "Simon J. Gerraty" Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.20 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Jun 2015 04:46:30 -0000 On Sat, Jun 13, 2015 at 3:34 PM, Craig Rodrigues wrote: > > On Sat, Jun 13, 2015 at 12:20 PM, Simon J. Gerraty 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