git: 4631803334b3 - stable/13 - wpa: Correctly build the hostapd BSD driver

[Cy Schubert]

The branch stable/13 has been updated by cy:

URL: https://cgit.FreeBSD.org/src/commit/?id=4631803334b3721338291194acb478832d9ee323

commit 4631803334b3721338291194acb478832d9ee323
Author:     Cy Schubert <cy at FreeBSD.org>
AuthorDate: 2021-08-26 22:59:03 +0000
Commit:     Cy Schubert <cy at FreeBSD.org>
CommitDate: 2021-09-04 14:22:39 +0000

    wpa: Correctly build the hostapd BSD driver
    
    driver.bsd.c initializes itself differently when built for
    hostapd than it does when built for wpa_supplicant.
    
    (cherry picked from commit a0f2aa9318a21f401a0aef2cde666edc56a92b46)
---
 usr.sbin/wpa/hostapd/Makefile        | 4 +++-
 usr.sbin/wpa/src/drivers/Makefile    | 1 -
 usr.sbin/wpa/wpa_supplicant/Makefile | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/usr.sbin/wpa/hostapd/Makefile b/usr.sbin/wpa/hostapd/Makefile
index c7775c960ddd..1ae4481a863e 100644
--- a/usr.sbin/wpa/hostapd/Makefile
+++ b/usr.sbin/wpa/hostapd/Makefile
@@ -5,12 +5,14 @@
 
 .include "../Makefile.crypto"
 
-.PATH.c:${HOSTAPD_DISTDIR}
+.PATH.c:${HOSTAPD_DISTDIR} \
+	${WPA_DISTDIR}/src/drivers
 
 PACKAGE=	hostapd
 PROG=	hostapd
 SRCS=	config_file.c \
 	ctrl_iface.c \
+	driver_bsd.c \
 	eap_register.c \
 	main.c
 
diff --git a/usr.sbin/wpa/src/drivers/Makefile b/usr.sbin/wpa/src/drivers/Makefile
index 0f901bdcf2fd..a984a9c1807a 100644
--- a/usr.sbin/wpa/src/drivers/Makefile
+++ b/usr.sbin/wpa/src/drivers/Makefile
@@ -10,7 +10,6 @@ INTERNALLIB=
 .PATH:	${WPA_DISTDIR}/src/drivers
 
 SRCS=	drivers.c \
-	driver_bsd.c \
 	driver_common.c \
 	driver_wired.c \
 	driver_wired_common.c
diff --git a/usr.sbin/wpa/wpa_supplicant/Makefile b/usr.sbin/wpa/wpa_supplicant/Makefile
index 9b31bea2a63c..27bf83d29f7e 100644
--- a/usr.sbin/wpa/wpa_supplicant/Makefile
+++ b/usr.sbin/wpa/wpa_supplicant/Makefile
@@ -18,6 +18,7 @@ SRCS=	blacklist.c \
 	config_file.c \
 	ctrl_iface.c \
 	ctrl_iface_unix.c \
+	driver_bsd.c \
 	eap_register.c \
 	events.c \
 	gas_query.c \