From owner-svn-src-head@FreeBSD.ORG Sun Jun 14 17:57:21 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 9608BBB0 for ; Sun, 14 Jun 2015 17:57:21 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from mail-ig0-f173.google.com (mail-ig0-f173.google.com [209.85.213.173]) (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 5C882B07 for ; Sun, 14 Jun 2015 17:57:21 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: by igbsb11 with SMTP id sb11so37225614igb.0 for ; Sun, 14 Jun 2015 10:57:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:subject:mime-version:content-type:from :in-reply-to:date:cc:message-id:references:to; bh=1nr+9Vduaoc0vNaSfAw2wkriFUfrHll4KXoXr+3G4Ek=; b=Ib3VmXqVqoEt2n2pFxciW/Oq66torgDTcgP4tlEXIgaZFWd8ZemC6o1T9+1ZnMSToq b0iG2XDFcCEPdpimPnwy16Cx8ruAEgdtB4KFiDFs3hF1YlvrU+B9TOg9u1cNFjon4fhm 7LyoS3KaNY1qvF8OLuefneOSE8YSIn2ykyyE5R8vqHVMfAPmTvXRe2YyHHDQ95v2DM0C CrKSh99D7v9Ir7Xyz+LeDc2ZdKlrtJgiYkcvkcjbKOhGbf5roSMzxQ73fJ/fp68vg4ZL ARO0FkipxK3aA/ryUeCKHa+ymFpVE2rktkhGwF7aZ+Uq7or1AprcPZ1l9C41fy8SdUgV qi6g== X-Gm-Message-State: ALoCoQkf5kVzsC3Y7waaTH2Bvciy2NdKLQOuGpjv/OKJZpaFAR565tyMEZ0XdGOz1VDfc6GgoXru X-Received: by 10.43.10.194 with SMTP id pb2mr26953310icb.31.1434304640568; Sun, 14 Jun 2015 10:57:20 -0700 (PDT) Received: from netflix-mac.bsdimp.com ([50.253.99.174]) by mx.google.com with ESMTPSA id q10sm5849492ige.16.2015.06.14.10.57.19 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 14 Jun 2015 10:57:19 -0700 (PDT) Sender: Warner Losh 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... Mime-Version: 1.0 (Mac OS X Mail 8.2 \(2098\)) Content-Type: multipart/signed; boundary="Apple-Mail=_BB29014A-84EA-4BC8-B3E5-192B36885A64"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Pgp-Agent: GPGMail 2.5b6 From: Warner Losh In-Reply-To: Date: Sun, 14 Jun 2015 13:57:19 -0400 Cc: "Simon J. Gerraty" , "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Message-Id: <4E3C5AEE-8AF8-4594-86F3-19856810F4F8@bsdimp.com> References: <201506131920.t5DJKwMH033508@svn.freebsd.org> To: Craig Rodrigues X-Mailer: Apple Mail (2.2098) 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 17:57:21 -0000 --Apple-Mail=_BB29014A-84EA-4BC8-B3E5-192B36885A64 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On Jun 14, 2015, at 12:46 AM, Craig Rodrigues = wrote: >=20 > 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=3D/builds/FreeBSD_HEAD/make.conf > > make: "/builds/FreeBSD_HEAD/Makefile" line 102: Malformed = conditional (${MK_META_MODE} =3D=3D "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. > > >=20 > I can reproduce the problem pretty quickly. > I did this on a FreeBSD-CURRENT host: >=20 > # svn co svn://svn.freebsd.org/base/head src > # cd src > # make -V MK_META_MODE > no >=20 > I did this on a FreeBSD 10.1-R host: >=20 > # 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} =3D=3D "yes") > make: Fatal errors encountered -- cannot continue > make: stopped in /root/src >=20 > 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. >=20 > I am not sure if this is the right fix, but I did this: >=20 > Index: Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > --- Makefile (revision 284374) > +++ Makefile (working copy) > @@ -99,7 +99,7 @@ > # > # For more information, see the build(7) manual page. > # > -.if ${MK_META_MODE} =3D=3D "yes" > +.if !empty(MK_META_MODE) && ${MK_META_MODE} =3D=3D "yes" > # targets/Makefile plays the role of top-level > .include "targets/Makefile" > .else >=20 >=20 > and that made things work for me on FreeBSD 10.1-R. Since the src.opts.mk files isn=E2=80=99t included for src/Makefile, = MK_META_MODE isn=E2=80=99t defined. Warner --Apple-Mail=_BB29014A-84EA-4BC8-B3E5-192B36885A64 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQIcBAEBCgAGBQJVfcCAAAoJEGwc0Sh9sBEAQLIQANy2xf5S6d9fX/YBY+jrZzhU gI+SnQZqAORoSgFsZPCR4H+v9I6zBDAsT3o3P9BPcgiXvRSHO57Umwz3jPMxnzfG G0AeLn1EpCSpjkU9P5HlcHlOKm2B4fN0nwxiQb0MoR4rvW8KGhHcj7nMl3OHIxVb 0oFquEXMUny5hvRQ6NL86cpIbGHEMMT38FpxvEIJaJTCfyyMV3U1KS3u1GkRds8l P5S2uT6Lxb0erMWOlu1FAzRtui0B3EvSAMH3QxMjMrCxFX5K363yIEdBMW7X6EVF e8OzrpEEjdyJLfvtugl2FmQ6U8gTfdD+hU6x7kC70y9MSOWjidj4GIvLs/6DDkGs K0iWQwe7FyPemPM6gWOvwsGwvTrNw3tKrBxtJLLWUypGxhiwy2rGYxxq8Kd6/IsY +eoUgDyWemV0qnrDwngdnYEHoDqO3cv+dLHFhHVGs67dD4YpI4x1miOCLr42DlbF 0K/D5Wlj4MQ9Y8pd/Vz6PEh/NkXPkQXDICXra/Q0/4sJ9bfCYISiP7+18PyTHJIL mfGXGOJcBM5GnsxK6WA/MWty7qUl9W4rTnfBQOrz9EGPWeHOYTj4K/7prZhy68x5 IpoujEyJY3GlxgMp3gPDQx4bTtk3ny0Gpy6bG5wPR12BBOajPcPcl01EzVhz/9Sh 9KCYHG97XlyE1TtMt0S3 =WhGc -----END PGP SIGNATURE----- --Apple-Mail=_BB29014A-84EA-4BC8-B3E5-192B36885A64--