git: 681500889424 - main - wpa: Fix GCC 6 build

[Cy Schubert]

The branch main has been updated by cy:

URL: https://cgit.FreeBSD.org/src/commit/?id=681500889424423403ace51f118b3467e09acc00

commit 681500889424423403ace51f118b3467e09acc00
Author:     Cy Schubert <cy at FreeBSD.org>
AuthorDate: 2021-06-04 01:40:55 +0000
Commit:     Cy Schubert <cy at FreeBSD.org>
CommitDate: 2021-06-04 04:13:00 +0000

    wpa: Fix GCC 6 build
    
    GCC 6 searches serially to resolve external references.
    
    MFC after:      2 months
    X-MFC with:     25ecdc7d52770caf1c9b44b5ec11f468f6b636f3
---
 usr.sbin/wpa/hostapd/Makefile        | 8 ++++----
 usr.sbin/wpa/wpa_cli/Makefile        | 4 ++--
 usr.sbin/wpa/wpa_supplicant/Makefile | 7 ++++---
 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}