From owner-freebsd-current@FreeBSD.ORG Thu May 8 23:54:20 2014 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3E7B4DD8 for ; Thu, 8 May 2014 23:54:20 +0000 (UTC) Received: from mail-pa0-f41.google.com (mail-pa0-f41.google.com [209.85.220.41]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0E106351 for ; Thu, 8 May 2014 23:54:19 +0000 (UTC) Received: by mail-pa0-f41.google.com with SMTP id lj1so3509017pab.28 for ; Thu, 08 May 2014 16:54:13 -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:content-type:mime-version:subject:from :in-reply-to:date:cc:message-id:references:to; bh=3chm4sD51Mr6cp9q/mMmwX5yfCcYLDz+jDSWpY5BykY=; b=cRGKwsxntp6PfkJU3l8MkVXO/TWNAPslvLSwSfHndpAzP+IME8WOUGu9RBeiZU6TRh iOc7l/pruxF7R9CCBYx03PLyGPfg3cOXcPn4uzRyGo9DFegaTvzCXDWTPtVQ/ihTA8Lt YDLPpP0J9laR/NpzE4N3anW5OcKVk0g20H+NLUeM6CPo2vMHZ1nUaRgZjRLHzCnanknk D3r3k0LGmEm0wWRREMgKqZ3VQdC6eHLoL05u5SywdQKTeXHe9UIBDuHOcdbIb4G8WiFa eEFJwXEVPikphHx/IbX1oShhQ2e5uuwkVeeryQbIdA3m3adMtaLLmf6koln+Hnd+IYol 5UXQ== X-Gm-Message-State: ALoCoQn98TmTCn7KeCYqabBgehV1+8q8CCuR8B3MENCYUODH7r+fDElvawXJdRHKUR04ZTeOG4Mn X-Received: by 10.66.65.204 with SMTP id z12mr13461023pas.60.1399593252890; Thu, 08 May 2014 16:54:12 -0700 (PDT) Received: from [10.45.102.71] ([156.39.128.195]) by mx.google.com with ESMTPSA id gu1sm4120828pbd.0.2014.05.08.16.54.11 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 08 May 2014 16:54:12 -0700 (PDT) Sender: Warner Losh Content-Type: multipart/signed; boundary="Apple-Mail=_B0BFDAD8-6650-45D7-8189-52AB9A30F303"; protocol="application/pgp-signature"; micalg=pgp-sha512 Mime-Version: 1.0 (Mac OS X Mail 7.2 \(1874\)) Subject: Re: WITHOUT_NIS after bsd.opts.mk / src.opts.mk split From: Warner Losh In-Reply-To: Date: Thu, 8 May 2014 16:54:10 -0700 Message-Id: <1A74E775-B873-44E1-8323-D3C292A3D02E@bsdimp.com> References: To: Guy Yur X-Mailer: Apple Mail (2.1874) Cc: freebsd-current@freebsd.org X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 May 2014 23:54:20 -0000 --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 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(____) ____: =20 -# Compat -- needed still? -.include - -# 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 + # # 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--