From owner-svn-src-head@freebsd.org Sun Aug 2 19:37:43 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 31E419B193D for ; Sun, 2 Aug 2015 19:37:43 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from mail-pa0-f49.google.com (mail-pa0-f49.google.com [209.85.220.49]) (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 049A22C1 for ; Sun, 2 Aug 2015 19:37:42 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: by pacgq8 with SMTP id gq8so7736052pac.3 for ; Sun, 02 Aug 2015 12:37:36 -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=2hvezxoA3O8/ySOkDP1xgSdlTn0ImyWTz5ehnNDrOD0=; b=MZS/MC0bd8/iGIAAgMCk4a8lUlJVbC+qlQNVzZ+4tsZ3pueczzUVukSLWdKoqAVyao 24rh+ELWH6cowyWrretEPuwXt8LaabDtwQukyaLboaCgIXOUzUgiy+hLRLXGrklQAqGH dkdojk3nee/c0m9HjnavIkmr77I0MI3+FhMvdJ6WNmZl71f62DrjCJqlMd8HX3/cNj7w 821CaAtKcCjjjw2/abLWhQCp216UF6DTT2l7araCumhuUr84BEC5hMsvxl3biYGRuKCl u3GrStBvn3sf9km2EvpIZ8Uzuc+XE0OgsAEHQtUGA1DQCk9mg4PZ5q+XxPHETuGgOdhf +1DA== X-Gm-Message-State: ALoCoQlagpVYAh3UwpQdsK5lmtBAL9PJJsbV2TwbDuPzhnjb5mvkrlx2eBstIosqXUraEo5UD0Zs X-Received: by 10.67.5.37 with SMTP id cj5mr29095497pad.44.1438544256321; Sun, 02 Aug 2015 12:37:36 -0700 (PDT) Received: from [10.64.26.198] ([69.53.236.236]) by smtp.gmail.com with ESMTPSA id zb2sm5446993pbb.46.2015.08.02.12.37.34 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 02 Aug 2015 12:37:35 -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 \(2102\)) Content-Type: multipart/signed; boundary="Apple-Mail=_87BD33B6-CB4E-401F-9333-8536CC1BE24A"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Pgp-Agent: GPGMail 2.5 From: Warner Losh In-Reply-To: <852.1438482871@chaos> Date: Sun, 2 Aug 2015 13:37:32 -0600 Cc: Baptiste Daroussin , src-committers@FreeBSD.org, svn-src-all@FreeBSD.org, svn-src-head@FreeBSD.org Message-Id: <7B84DD3E-87F3-48C9-82CD-687A83CFFB4E@bsdimp.com> References: <201506131920.t5DJKwMH033508@svn.freebsd.org> <20150726204948.GD1522@ivaldir.etoilebsd.net> <852.1438482871@chaos> To: "Simon J. Gerraty" X-Mailer: Apple Mail (2.2102) 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, 02 Aug 2015 19:37:43 -0000 --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 wrote: >=20 > Baptiste Daroussin 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 > +.sinclude >=20 > +.if defined(.PARSEDIR) > +# none of this is relevant without bmake > .if ${MK_META_MODE} =3D=3D "yes" > .-include > .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 > .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 > +.sinclude >=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 >=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--