diff options
| author | Cy Schubert <cy@FreeBSD.org> | 2021-08-26 22:59:03 +0000 |
|---|---|---|
| committer | Cy Schubert <cy@FreeBSD.org> | 2021-09-13 21:12:03 +0000 |
| commit | 7aed82ab023aeb3d1304161944633ba75c6ab5f6 (patch) | |
| tree | 7be54367cca6d70c795f1408277ca44f0393a0df | |
| parent | fa6a598d732a024dc5d8005c6e4985b53f491dad (diff) | |
| download | src-7aed82ab023aeb3d1304161944633ba75c6ab5f6.tar.gz src-7aed82ab023aeb3d1304161944633ba75c6ab5f6.zip | |
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)
| -rw-r--r-- | usr.sbin/wpa/hostapd/Makefile | 4 | ||||
| -rw-r--r-- | usr.sbin/wpa/src/drivers/Makefile | 1 | ||||
| -rw-r--r-- | 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 613771ddd974..57b218c99e14 100644 --- a/usr.sbin/wpa/hostapd/Makefile +++ b/usr.sbin/wpa/hostapd/Makefile @@ -5,11 +5,13 @@ .include "../Makefile.crypto" -.PATH.c:${HOSTAPD_DISTDIR} +.PATH.c:${HOSTAPD_DISTDIR} \ + ${WPA_DISTDIR}/src/drivers 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 61f035f15912..9706d0e4b644 100644 --- a/usr.sbin/wpa/wpa_supplicant/Makefile +++ b/usr.sbin/wpa/wpa_supplicant/Makefile @@ -17,6 +17,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 \ |