Date: Thu, 8 May 2014 16:54:10 -0700 From: Warner Losh <imp@bsdimp.com> To: Guy Yur <guyyur@gmail.com> Cc: freebsd-current@freebsd.org Subject: Re: WITHOUT_NIS after bsd.opts.mk / src.opts.mk split Message-ID: <1A74E775-B873-44E1-8323-D3C292A3D02E@bsdimp.com> In-Reply-To: <CAC67Hz_TLidKJfg1McqgqGKyOHcpE%2BuhHPHWWiEynpD9YrFV7w@mail.gmail.com> References: <CAC67Hz_TLidKJfg1McqgqGKyOHcpE%2BuhHPHWWiEynpD9YrFV7w@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--Apple-Mail=_B0BFDAD8-6650-45D7-8189-52AB9A30F303
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain;
charset=windows-1252
On May 8, 2014, at 3:26 PM, Guy Yur <guyyur@gmail.com> wrote:
> Hi,
>=20
> After the bsd.opts.mk / src.opts.mk split
> WITHOUT_NIS in src.conf doesn't work.
It should still work=85 At least that=92s the intention...
> src.conf is included in src.opts.mk after bsd.own.mk
> which includes bsd.opts.mk.
Yea, that=92s a problem=85 It should be included after.
> Should bsd.opts.mk options overrides now be set in
> make.conf instead of src.conf?
That=92s a good workaround until I get that fix tested and committed. Or =
you could include src.conf in make.conf at the end. Either will have the =
same effect.
Here=92s the fix I=92m testing, if you=92d like to test that instead...
diff -r d69444b828c1 share/mk/src.opts.mk
--- a/share/mk/src.opts.mk
+++ b/share/mk/src.opts.mk
@@ -30,17 +30,15 @@
.if !target(__<src.opts.mk>__)
__<src.opts.mk>__:
=20
-# Compat -- needed still?
-.include <bsd.own.mk>
-
-# Allow user to configure things, but in the future this will move
-# elsehwere...
-
+# Allow user to configure things that only effect src tree builds.
SRCCONF?=3D /etc/src.conf
.if exists(${SRCCONF}) || ${SRCCONF} !=3D "/etc/src.conf"
.include "${SRCCONF}"
.endif
=20
+# Must be included after src.conf
+.include <bsd.own.mk>
+
#
# Define MK_* variables (which are either "yes" or "no") for users
# to set via WITH_*/WITHOUT_* in /etc/src.conf and override in the
> Was on r265455, updated to r265715 and rebuilt with -DNO_CLEAN.
Yea, sorry about missing this subtle issue in the split. There was =
another report of something similar that I hadn=92t tracked down, but =
your report pointed me to where I needed to go.
Warner
--Apple-Mail=_B0BFDAD8-6650-45D7-8189-52AB9A30F303
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
iQIcBAEBCgAGBQJTbBkiAAoJEGwc0Sh9sBEAGKkQAISdcNvtvmmNHj3WsE+V/vJ2
3OzGfgOvvYcoPytyOOjj/y3T0Wp3ETA1wFx+8vBuHk515kw9Y2S0lkvalsWYcCOP
7y+ToUjRTzCX7DptVBywrYkhhCXE+O73WyjsdCuJ3qLqaPNHNMKu+kUpIK8By+6s
ypKZ23Jv6OGXoD0sdM2sxYFolTATEzAKHLx59NFyb9KWnj6f3vPY5o8bYxmeOKE0
9erCeUsnJ1UkVUKHn4fNoVAmIrZ0zahXp1mgwWXqm0q5eu51mayP70l09sTrzQFa
yGiYDmEeGzXOtkHtaUeG3nHK4fasHOWD1Pr/Im2aocJ4RsDRle2Z/komHcmJCf8S
ICg0wecZofeIl8v8tWserX73VMwwBhrKtQBYrj0TpEfzqAnE7E8mjWwXKzU5lOgY
OiHc0LaOEMfjHJgqBvGWygHh74IqMiaG/eEBJxpLkfYZm2YddfAlTgaHTVmoEonl
+c2H7lGkV1x4TsU4C3qXK1R0ikx+buqpU9kxjwuRdOwxdKAu+54LYocyfZU4mci2
AjEaZB83dDc9XCUkTPpb2j5UISKKBJI5D2sPFg67sZ+uGP4Nsdtf2VoT3Ki9lR2W
SQgLENkXVq1Sxeay9wC3Jqndozwdw6ugw+MgLTUpEhZynXeQI2Ne6vOy6IdDVtT6
2wG/mhiHKmCgJbYh82A8
=OFNV
-----END PGP SIGNATURE-----
--Apple-Mail=_B0BFDAD8-6650-45D7-8189-52AB9A30F303--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1A74E775-B873-44E1-8323-D3C292A3D02E>