Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 8 Sep 2015 20:41:48 +0000 (UTC)
From:      Jung-uk Kim <jkim@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r287577 - in head/usr.sbin/wpa: hostapd wpa_supplicant
Message-ID:  <201509082041.t88KfmkV086060@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jkim
Date: Tue Sep  8 20:41:47 2015
New Revision: 287577
URL: https://svnweb.freebsd.org/changeset/base/287577

Log:
  Sort and remove duplicate compiler flags.
  
  MFC after:	3 days

Modified:
  head/usr.sbin/wpa/hostapd/Makefile
  head/usr.sbin/wpa/wpa_supplicant/Makefile

Modified: head/usr.sbin/wpa/hostapd/Makefile
==============================================================================
--- head/usr.sbin/wpa/hostapd/Makefile	Tue Sep  8 20:22:51 2015	(r287576)
+++ head/usr.sbin/wpa/hostapd/Makefile	Tue Sep  8 20:41:47 2015	(r287577)
@@ -35,15 +35,15 @@ FILES=	hostapd.conf hostapd.eap_user hos
 .endif
 
 CFLAGS+=-DCONFIG_DRIVER_BSD \
-	-DHOSTAPD \
 	-DCONFIG_DRIVER_RADIUS_ACL \
-	-DCONFIG_RSN_PREAUTH \
+	-DCONFIG_HS20 \
+	-DCONFIG_INTERWORKING \
 	-DCONFIG_PEERKEY \
+	-DCONFIG_RSN_PREAUTH \
 	-DCONFIG_WPS \
 	-DCONFIG_WPS2 \
 	-DCONFIG_WPS_UPNP \
-	-DCONFIG_INTERWORKING \
-	-DCONFIG_HS20
+	-DHOSTAPD
 .if ${MK_INET6} != "no"
 CFLAGS+= -DCONFIG_IPV6
 .endif
@@ -65,8 +65,8 @@ CFLAGS+=-DDPKCS12_FUNCS \
 	-DEAP_SERVER_PEAP \
 	-DEAP_SERVER_TLS \
 	-DEAP_SERVER_TTLS \
-	-DEAP_TLS_FUNCS \
-	-DEAP_SERVER_WSC
+	-DEAP_SERVER_WSC \
+	-DEAP_TLS_FUNCS
 
 SRCS+=	eap_server_gtc.c \
 	eap_server_identity.c \

Modified: head/usr.sbin/wpa/wpa_supplicant/Makefile
==============================================================================
--- head/usr.sbin/wpa/wpa_supplicant/Makefile	Tue Sep  8 20:22:51 2015	(r287576)
+++ head/usr.sbin/wpa/wpa_supplicant/Makefile	Tue Sep  8 20:41:47 2015	(r287577)
@@ -38,18 +38,18 @@ CFLAGS+=-DCONFIG_BACKEND_FILE \
 	-DCONFIG_DRIVER_BSD \
 	-DCONFIG_DRIVER_NDIS \
 	-DCONFIG_DRIVER_WIRED \
+	-DCONFIG_GAS \
+	-DCONFIG_HS20 \
+	-DCONFIG_IEEE80211R \
+	-DCONFIG_INTERWORKING \
 	-DCONFIG_PEERKEY \
+	-DCONFIG_PRIVSEP \
 	-DCONFIG_SMARTCARD \
 	-DCONFIG_TERMINATE_ONLASTIF \
+	-DCONFIG_TLS=openssl \
 	-DCONFIG_WPS \
 	-DCONFIG_WPS2 \
 	-DCONFIG_WPS_UPNP \
-	-DCONFIG_TLS=openssl \
-	-DCONFIG_IEEE80211R \
-	-DCONFIG_INTERWORKING \
-	-DCONFIG_PRIVSEP \
-	-DCONFIG_HS20 \
-	-DCONFIG_GAS \
 	-DPKCS12_FUNCS
 #CFLAGS+= -g
 LIBADD=	pcap util
@@ -70,9 +70,6 @@ CFLAGS+=-DEAP_GTC \
 	-DEAP_PSK \
 	-DEAP_TLS \
 	-DEAP_TTLS \
-	-DEAP_GTC \
-	-DEAP_OTP \
-	-DEAP_LEAP \
 	-DIEEE8021X_EAPOL
 SRCS+=	chap.c \
 	eap.c \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509082041.t88KfmkV086060>