Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 14 Jun 2015 13:57:19 -0400
From:      Warner Losh <imp@bsdimp.com>
To:        Craig Rodrigues <rodrigc@FreeBSD.org>
Cc:        "Simon J. Gerraty" <sjg@freebsd.org>, "src-committers@freebsd.org" <src-committers@freebsd.org>, "svn-src-all@freebsd.org" <svn-src-all@freebsd.org>, "svn-src-head@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:  <4E3C5AEE-8AF8-4594-86F3-19856810F4F8@bsdimp.com>
In-Reply-To: <CAG=rPVcwNXS=qdQ4=%2Bu3GtUi1Twj1Wj0=Cj-6jZz=B%2B2NGUN2g@mail.gmail.com>
References:  <201506131920.t5DJKwMH033508@svn.freebsd.org> <CAG=rPVfR3QbvYEM9Xdpxdhx_Aisj7Z0=mVig4HyUkk4uqQGrOg@mail.gmail.com> <CAG=rPVcwNXS=qdQ4=%2Bu3GtUi1Twj1Wj0=Cj-6jZz=B%2B2NGUN2g@mail.gmail.com>

next in thread | previous in thread | raw e-mail | index | archive | help

--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 <rodrigc@FreeBSD.org> =
wrote:
>=20
> On Sat, Jun 13, 2015 at 3:34 PM, Craig Rodrigues <rodrigc@freebsd.org> =
wrote:
> >
> > On Sat, Jun 13, 2015 at 12:20 PM, Simon J. Gerraty <sjg@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=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--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4E3C5AEE-8AF8-4594-86F3-19856810F4F8>