From 635891d1c37b6491573970977b0a81765d5b08da Mon Sep 17 00:00:00 2001
From: Kyle Evans <kevans@FreeBSD.org>
Date: Sun, 20 Apr 2025 22:44:54 -0500
Subject: [PATCH] bsdbox: hook wpa_supplicant up as well

We may want a knob for this later for Adrian's wifi-box builds if those
are still happening now that mips is gone, but I suspect it's less of a
concern for FreeBSD > 14 (and maybe even 14 as well).

Reviewed by:	adrian, imp
Differential Revision:	https://reviews.freebsd.org/D42501
---
 tools/bsdbox/Makefile.hostapd | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/tools/bsdbox/Makefile.hostapd b/tools/bsdbox/Makefile.hostapd
index 95c6a7f7f45..6bce1c42b5c 100644
--- a/tools/bsdbox/Makefile.hostapd
+++ b/tools/bsdbox/Makefile.hostapd
@@ -9,9 +9,9 @@ CRUNCH_SRCDIR_hostapd_cli=	$(.CURDIR)/../../usr.sbin/wpa/hostapd_cli
 
 CRUNCH_KEEP_hostapd+=	wpa_driver_bsd_ops
 
-#CRUNCH_PROGS_usr.sbin+=	wpa_supplicant wpa_cli
-#CRUNCH_SRCDIR_wpa_supplicant=	$(.CURDIR)/../../usr.sbin/wpa/wpa_supplicant
-#CRUNCH_SRCDIR_wpa_cli=	$(.CURDIR)/../../usr.sbin/wpa/wpa_cli
+CRUNCH_PROGS_usr.sbin+=	wpa_supplicant wpa_cli
+CRUNCH_SRCDIR_wpa_supplicant=	$(.CURDIR)/../../usr.sbin/wpa/wpa_supplicant
+CRUNCH_SRCDIR_wpa_cli=	$(.CURDIR)/../../usr.sbin/wpa/wpa_cli
 
 .if ${MK_OFED} != "no"
 # libpcap dependencies if OFED is enabled
@@ -19,10 +19,14 @@ CRUNCH_LIBS+=	-lmlx5 -libverbs
 .endif
 CRUNCH_LIBS+=	-lpcap
 
+# hostapd
 wpalibs=	drivers ap l2_packet eap_server
 wpalibs+=	eapol_auth eap_common
 wpalibs+=	radius tls wps common crypto utils
 
+# wpa_supplicant
+wpalibs+=	eapol_supp eap_peer rsn_supp
+
 .for wpalib in ${wpalibs}
 CRUNCH_LIBS+=	${LIBWPA${wpalib:tu}}
 .endfor