aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCy Schubert <cy@FreeBSD.org>2021-06-04 01:40:55 +0000
committerCy Schubert <cy@FreeBSD.org>2021-08-20 15:24:54 +0000
commit6f3564a52cf16a8cad7c073de4f875bdd0547ed0 (patch)
treec409ddff6874990f89241c8dc5bcf7cafed3c2f0
parent0a4379136f80e7e3caf6d0f6b4069ca29895e5f7 (diff)
downloadsrc-6f3564a52cf16a8cad7c073de4f875bdd0547ed0.tar.gz
src-6f3564a52cf16a8cad7c073de4f875bdd0547ed0.zip
wpa: Fix GCC 6 build
GCC 6 searches serially to resolve external references. (cherry picked from commit 681500889424423403ace51f118b3467e09acc00)
-rw-r--r--usr.sbin/wpa/hostapd/Makefile8
-rw-r--r--usr.sbin/wpa/wpa_cli/Makefile4
-rw-r--r--usr.sbin/wpa/wpa_supplicant/Makefile7
3 files changed, 10 insertions, 9 deletions
diff --git a/usr.sbin/wpa/hostapd/Makefile b/usr.sbin/wpa/hostapd/Makefile
index c0083747782a..c7775c960ddd 100644
--- a/usr.sbin/wpa/hostapd/Makefile
+++ b/usr.sbin/wpa/hostapd/Makefile
@@ -31,10 +31,10 @@ CFLAGS+=-I${.CURDIR:H}/wpa_supplicant \
CFLAGS+= -DCONFIG_IPV6
.endif
#CFLAGS+= -g
-LIBADD+= pcap util wpaap wpacommon wpacrypto \
- wpadrivers wpal2_packet wpaeap_common wpaeap_server \
- wpaeapol_auth \
- wparadius wpatls wpautils wpawps
+LIBADD+= pcap util \
+ wpadrivers wpaap wpal2_packet wpaeap_server \
+ wpaeapol_auth wpaeap_common \
+ wparadius wpatls wpawps wpacommon wpacrypto wpautils
# User customizations for wpa_supplicant/hostapd build environment
CFLAGS+=${HOSTAPD_CFLAGS}
diff --git a/usr.sbin/wpa/wpa_cli/Makefile b/usr.sbin/wpa/wpa_cli/Makefile
index bf2cf6252550..93a24295f4a2 100644
--- a/usr.sbin/wpa/wpa_cli/Makefile
+++ b/usr.sbin/wpa/wpa_cli/Makefile
@@ -21,16 +21,16 @@ CFLAGS+= -D_DIRENT_HAVE_D_TYPE
CFLAGS+= -DCONFIG_WPA_CLI_EDIT=y
LIBADD+=wpaap \
wpacommon \
- wpacrypto \
- wpaeap_common \
wpaeap_peer \
wpaeap_server \
wpaeapol_auth \
wpaeapol_supp \
+ wpaeap_common \
wpal2_packet \
wparadius \
wparsn_supp \
wpatls \
+ wpacrypto \
wpautils
LIBADD+= pcap util
diff --git a/usr.sbin/wpa/wpa_supplicant/Makefile b/usr.sbin/wpa/wpa_supplicant/Makefile
index 332f66315346..c86be9497eca 100644
--- a/usr.sbin/wpa/wpa_supplicant/Makefile
+++ b/usr.sbin/wpa/wpa_supplicant/Makefile
@@ -41,9 +41,10 @@ FILES= wpa_supplicant.conf
CFLAGS+=-DCONFIG_BACKEND_FILE
#CFLAGS+= -g
-LIBADD+=pcap util wpaap wpacommon wpacrypto wpadrivers wpaeapol_supp \
- wpaeap_common wpaeap_server \
- wpaeap_peer wpal2_packet wparsn_supp wpatls wpautils wpawps
+LIBADD+=pcap util wpadrivers wpaap wpaeapol_supp \
+ wpaeap_server \
+ wpaeap_peer wpaeap_common wpal2_packet wparsn_supp wpatls wpawps \
+ wpacommon wpacrypto wpautils
# User customizations to the wpa_supplicant build environment
CFLAGS+=${WPA_SUPPLICANT_CFLAGS}