Date: Sun, 2 Aug 2015 13:37:32 -0600 From: Warner Losh <imp@bsdimp.com> To: "Simon J. Gerraty" <sjg@juniper.net> Cc: Baptiste Daroussin <bapt@FreeBSD.org>, src-committers@FreeBSD.org, svn-src-all@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: <7B84DD3E-87F3-48C9-82CD-687A83CFFB4E@bsdimp.com> In-Reply-To: <852.1438482871@chaos> References: <201506131920.t5DJKwMH033508@svn.freebsd.org> <20150726204948.GD1522@ivaldir.etoilebsd.net> <852.1438482871@chaos>
next in thread | previous in thread | raw e-mail | index | archive | help
--Apple-Mail=_87BD33B6-CB4E-401F-9333-8536CC1BE24A
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain;
charset=utf-8
> On Aug 1, 2015, at 8:34 PM, Simon J. Gerraty <sjg@juniper.net> wrote:
>=20
> Baptiste Daroussin <bapt@FreeBSD.org> wrote:
>> This breaks using fmake from ports because of usage of :U in sys.mk
>=20
> Oops - sorry.
> I saw Warner posted a patch for this which looked ok, but doesn't =
appear
> to have been committed.
Yea, I wanted to roll in your comments first, but my week has been quite =
busy
since then=E2=80=A6
Wanrer
>> is compatible with FreeBSD 9 (not that I'm just speaking about sys.mk =
not other
>> parts)
>=20
> Understood.
>=20
> AFAICT the following allows fmake to consume sys.mk
>=20
> Index: share/mk/sys.mk
> =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
> --- share/mk/sys.mk (revision 286177)
> +++ share/mk/sys.mk (working copy)
> @@ -33,8 +33,10 @@
>=20
> # early include for customization
> # see local.sys.mk below
> -.-include <local.sys.env.mk>
> +.sinclude <local.sys.env.mk>
>=20
> +.if defined(.PARSEDIR)
> +# none of this is relevant without bmake
> .if ${MK_META_MODE} =3D=3D "yes"
> .-include <meta.sys.mk>
> .elif ${MK_META_FILES} =3D=3D "yes" && ${.MAKEFLAGS:U:M-B} =3D=3D ""
> @@ -44,6 +46,7 @@
> # This needs to be done early - before .PATH is computed
> .-include <auto.obj.mk>
> .endif
> +.endif
>=20
> # 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
>=20
> # late include for customization
> -.-include <local.sys.mk>
> +.sinclude <local.sys.mk>
>=20
> .if defined(__MAKE_SHELL) && !empty(__MAKE_SHELL)
> SHELL=3D ${__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?=3D /bin/sh
> .SHELL: name=3Dsh \
> quiet=3D"set -" echo=3D"set -v" filter=3D"set -" \
> hasErrCtl=3Dyes check=3D"set -e" ignore=3D"set +e" \
> echoFlag=3Dv errFlag=3De \
> - path=3D${__MAKE_SHELL:U/bin/sh}
> + path=3D${__MAKE_SHELL}
> .endif
>=20
> .include <bsd.cpu.mk>
>=20
--Apple-Mail=_87BD33B6-CB4E-401F-9333-8536CC1BE24A
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
iQIcBAEBCgAGBQJVvnF9AAoJEGwc0Sh9sBEAAPYP/2oWZ72BwG9aqum2+6/cCsj1
QpjnDVGafhdDlWY0LHCzfQoENDcQKBxiD3wV0JcH+bggG6sZsxN1ylCLPRoP8PND
/JtzzsCZuScagCFwxKSgRAg2djm1+5DTlFJuHpb2swvFPe4Nxn4aXIQEbSbZFKaK
5dqo9m9cQTkeHs7tl2Ky+WmHA0Rz8c/KcNaRnPy1TYUUau+wJ3jQE6pG8C8jNiAI
EF9syF5ur1VPpy7TqA02112W8VtI3Kw9x74NpuiFWPifP5I228BOwVvXx6VCOxdr
UXf3W2sJ6jdhH/fFdbLi69n7z+3HplUKCmSbuccerdeN4rR8QB94HifEAhhIpiGU
Ec16RSJZjTX4qpGGwEDpeO9k+4oFFxdhvsSoJjLGQjPoZ1kDFj5Gj385hntn+Geo
w9jN0JD0tG/gPTwtrW3pKVji60VpEHvXDcGjXDJ1G1eh3H4INVLzWaWXLFmzNRtH
3ayPU5Ajd9qBFXJdqeGojScPfTD9BmAHswbfBxyW6VgCKvXnyG6YwNdoJyjytta2
87IiHD2CqqzuQCUd3t8LHR3tq25e8j51uboJsUoey0rTiaiePtur1+OBOcWMMKx7
Bb3ahzUOSdH7nKMN/cVwyHKPVW9cSo8BhlGskkC+kxBRox3LMh11czs+1J7zlO63
N10juwCUnPSfMJYUt41E
=vhJu
-----END PGP SIGNATURE-----
--Apple-Mail=_87BD33B6-CB4E-401F-9333-8536CC1BE24A--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?7B84DD3E-87F3-48C9-82CD-687A83CFFB4E>