From owner-dev-commits-src-main@freebsd.org Mon Jan 25 22:47:12 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 A21BA4F4E98; Mon, 25 Jan 2021 22:47:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DPlNw48jjz3lkQ; Mon, 25 Jan 2021 22:47:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 811821EB01; Mon, 25 Jan 2021 22:47:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 10PMlCsF027281; Mon, 25 Jan 2021 22:47:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 10PMlCUh027280; Mon, 25 Jan 2021 22:47:12 GMT (envelope-from git) Date: Mon, 25 Jan 2021 22:47:12 GMT Message-Id: <202101252247.10PMlCUh027280@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: 1fc148624f50 - main - Fix build following bfc99943b04b46a6c1c885ce7bcc6f235b7422aa. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1fc148624f50cbf93365f6d56c6587a7d268195b Auto-Submitted: auto-generated 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 22:47:12 -0000 The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=1fc148624f50cbf93365f6d56c6587a7d268195b commit 1fc148624f50cbf93365f6d56c6587a7d268195b Author: Cy Schubert AuthorDate: 2021-01-25 22:34:22 +0000 Commit: Cy Schubert 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