Date: Mon, 25 Jan 2021 23:37:57 +0000 From: Brooks Davis <brooks@freebsd.org> To: Cy Schubert <cy@FreeBSD.org> 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> In-Reply-To: <202101252247.10PMlCUh027280@gitrepo.freebsd.org> References: <202101252247.10PMlCUh027280@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] 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: > > URL: https://cgit.FreeBSD.org/src/commit/?id=1fc148624f50cbf93365f6d56c6587a7d268195b > > commit 1fc148624f50cbf93365f6d56c6587a7d268195b > Author: Cy Schubert <cy@FreeBSD.org> > AuthorDate: 2021-01-25 22:34:22 +0000 > Commit: Cy Schubert <cy@FreeBSD.org> > CommitDate: 2021-01-25 22:46:45 +0000 > > Fix build following bfc99943b04b46a6c1c885ce7bcc6f235b7422aa. > > bfc99943b04b46a6c1c885ce7bcc6f235b7422aa removed ndis(4) support however > wpa as delivered by the wpa upstream (w1.fi) enables NDIS by default. > This commit disables NDIS suppport in the w1.fi delivered build config, > circumventing the build failure. > --- > contrib/wpa/src/utils/build_config.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > 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 > [-- Attachment #2 --] -----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-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20210125233757.GC73987>