Date: Wed, 5 Oct 2016 13:27:44 -0700 From: Bryan Drewery <bdrewery@FreeBSD.org> To: Ed Maste <emaste@FreeBSD.org>, src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r306729 - head/tools/build/options Message-ID: <430cab29-2676-8aa0-68d2-f370725c137c@FreeBSD.org> In-Reply-To: <201610052012.u95KC1mg093045@repo.freebsd.org> References: <201610052012.u95KC1mg093045@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --TbGocT5DfDodu36kGwPF1LD5gf1pKCgx0 Content-Type: multipart/mixed; boundary="rbxcggNGk9dQFtODCVJuKrB2GVEJj7CXo"; protected-headers="v1" From: Bryan Drewery <bdrewery@FreeBSD.org> To: Ed Maste <emaste@FreeBSD.org>, src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-ID: <430cab29-2676-8aa0-68d2-f370725c137c@FreeBSD.org> Subject: Re: svn commit: r306729 - head/tools/build/options References: <201610052012.u95KC1mg093045@repo.freebsd.org> In-Reply-To: <201610052012.u95KC1mg093045@repo.freebsd.org> --rbxcggNGk9dQFtODCVJuKrB2GVEJj7CXo Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 10/5/16 1:12 PM, Ed Maste wrote: > Author: emaste > Date: Wed Oct 5 20:12:00 2016 > New Revision: 306729 > URL: https://svnweb.freebsd.org/changeset/base/306729 >=20 > Log: > makeman: avoid bogus output with duplicated options > =20 > On some targets 'make showconfig' currently reports both 'no' and 'ye= s' > for some options. For example: > =20 > % make TARGET=3Dmips showconfig | grep SSP > MK_SSP =3D no > MK_SSP =3D yes > =20 This problem in this case is because kern.opts.mk is returning MK_SSP=3Dyes due to bsd.opts.mk defaulting SSP to on, and src.opts.mk is returning MK_SSP=3Dno for TARGET_ARCH=3Dmips. This will fix it: https://people.freebsd.org/~bdrewery/patches/bsd.opts.mk.broken-options.p= atch I think it would be more proper to move any BROKEN_OPTIONS owned by bsd.opts.mk to there rather than in src.opts.mk. Since in this case SSP is broken on MIPS and yet will continue to be used for out-of-tree builds even though it is broken... > Emit a warning on encountering a duplicated variable, and skip the > second entry. > =20 > Sponsored by: The FreeBSD Foundation >=20 > Modified: > head/tools/build/options/makeman >=20 > Modified: head/tools/build/options/makeman > =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=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/tools/build/options/makeman Wed Oct 5 20:08:07 2016 (r306728)= > +++ head/tools/build/options/makeman Wed Oct 5 20:12:00 2016 (r306729)= > @@ -33,12 +33,18 @@ show_options() > ALL_TARGETS=3D$(echo $(${make} targets | tail -n +2)) > rm -f $t/settings > for target in ${ALL_TARGETS} ; do > + prev_opt=3D > env -i ${make} showconfig \ > SRC_ENV_CONF=3D/dev/null SRCCONF=3D/dev/null \ > __MAKE_CONF=3D/dev/null \ > TARGET_ARCH=3D${target#*/} TARGET=3D${target%/*} | > while read var _ val ; do > opt=3D${var#MK_} > + if [ $opt =3D "$prev_opt" ]; then > + echo "$target: ignoring duplicate option $opt" >&2 > + continue > + fi > + prev_opt=3D$opt > case ${val} in > yes) > echo ${opt} ${target} >=20 --=20 Regards, Bryan Drewery --rbxcggNGk9dQFtODCVJuKrB2GVEJj7CXo-- --TbGocT5DfDodu36kGwPF1LD5gf1pKCgx0 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQEcBAEBCgAGBQJX9WJBAAoJEDXXcbtuRpfPF1MIAJL87lFZed205JreC8oAIAp/ l+PYprm1s2A7xthEoyxa6xlgrGzSyGDQgB1Ldfkn/Bkuq9tnSX/GWGjULHmicahT FAev4i2hu1oiAZf6TgrXjXiulQFGDOz6+TLtVkRLi0AsfIfvnVRxealUH6FZyjU8 pwOeeDocq2CrUKzdoblcO3d3/PhFHYhcdP4CkAgX1g2fId8WaHjDIKnbZ6DuTlMN N3pffnPR2ho/r+bD+IJdTAN7kgxpzevHDrmBWZPADQADVp2IUNp3fvi3ceEzlGVG HC82EhvirzWkahWlioKTK4SMaouFHL57Y1o3YIp6wicMB2K6/KLnaTgOzxLhiWQ= =zPiq -----END PGP SIGNATURE----- --TbGocT5DfDodu36kGwPF1LD5gf1pKCgx0--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?430cab29-2676-8aa0-68d2-f370725c137c>