From owner-dev-commits-src-main@freebsd.org Mon Jan 25 23:38:03 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id F02B84F6993; Mon, 25 Jan 2021 23:38:03 +0000 (UTC) (envelope-from brooks@spindle.one-eyed-alien.net) Received: from spindle.one-eyed-alien.net (spindle.one-eyed-alien.net [199.48.129.229]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4DPmWb5kl6z3r8P; Mon, 25 Jan 2021 23:38:03 +0000 (UTC) (envelope-from brooks@spindle.one-eyed-alien.net) Received: by spindle.one-eyed-alien.net (Postfix, from userid 3001) id B8C613C0199; Mon, 25 Jan 2021 23:37:57 +0000 (UTC) Date: Mon, 25 Jan 2021 23:37:57 +0000 From: Brooks Davis To: Cy Schubert Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 1fc148624f50 - main - Fix build following bfc99943b04b46a6c1c885ce7bcc6f235b7422aa. Message-ID: <20210125233757.GC73987@spindle.one-eyed-alien.net> References: <202101252247.10PMlCUh027280@gitrepo.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="vGgW1X5XWziG23Ko" Content-Disposition: inline In-Reply-To: <202101252247.10PMlCUh027280@gitrepo.freebsd.org> User-Agent: Mutt/1.9.4 (2018-02-28) X-Rspamd-Queue-Id: 4DPmWb5kl6z3r8P X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Jan 2021 23:38:04 -0000 --vGgW1X5XWziG23Ko Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Thanks. I'd done a clean build in CI where wpa supplicant built so I'm not sure how I missed this. -- Brooks On Mon, Jan 25, 2021 at 10:47:12PM +0000, Cy Schubert wrote: > The branch main has been updated by cy: >=20 > URL: https://cgit.FreeBSD.org/src/commit/?id=3D1fc148624f50cbf93365f6d56c= 6587a7d268195b >=20 > commit 1fc148624f50cbf93365f6d56c6587a7d268195b > Author: Cy Schubert > AuthorDate: 2021-01-25 22:34:22 +0000 > Commit: Cy Schubert > CommitDate: 2021-01-25 22:46:45 +0000 >=20 > Fix build following bfc99943b04b46a6c1c885ce7bcc6f235b7422aa. > =20 > bfc99943b04b46a6c1c885ce7bcc6f235b7422aa removed ndis(4) support howe= ver > wpa as delivered by the wpa upstream (w1.fi) enables NDIS by default. > This commit disables NDIS suppport in the w1.fi delivered build confi= g, > circumventing the build failure. > --- > contrib/wpa/src/utils/build_config.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) >=20 > diff --git a/contrib/wpa/src/utils/build_config.h b/contrib/wpa/src/utils= /build_config.h > index c6f4e4379ae6..7d032373c8d3 100644 > --- a/contrib/wpa/src/utils/build_config.h > +++ b/contrib/wpa/src/utils/build_config.h > @@ -26,8 +26,8 @@ > #define PCSC_FUNCS > #define CONFIG_CTRL_IFACE > #define CONFIG_CTRL_IFACE_NAMED_PIPE > -#define CONFIG_DRIVER_NDIS > -#define CONFIG_NDIS_EVENTS_INTEGRATED > +#undef CONFIG_DRIVER_NDIS > +#undef CONFIG_NDIS_EVENTS_INTEGRATED > #define CONFIG_DEBUG_FILE > #define EAP_MD5 > #define EAP_TLS >=20 --vGgW1X5XWziG23Ko Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEcBAEBAgAGBQJgD1ZUAAoJEKzQXbSebgfAzyYIAJ7Pn5ZOMmxjGtwEUQNzPSrl 1WK01FkyYri7iPbH6nntnI+9lIfAGgP1QH6/p+5jlxlfF2Z184y9xVzACrPgGl1Y GvSEHkrkNxwHqsoDW0p+UWzF109kHQGEQXOoW8DiHPYcUgsxjVNHDjHJVrLKV+87 +3UwBZiUzWvMHytDoG0cfn8DvpRq1zbdy7/PiD6Ez7qJ6tZkDowD+wHiKsRkbv18 ARPy/OAbRe/Mt8/WgwqkLjDblsPSONqLR8gHR5FW9EXYkTYtTg7s3o8fp72XhRX1 55lFocg7HD1RktKMVqfzGeOAvnFtVLBRSZiEyng3Hj0GBvw/K/vHUKU3EnOMiOw= =9ZMK -----END PGP SIGNATURE----- --vGgW1X5XWziG23Ko--