jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

DPP: Fix wpa_supplicant build dependencies for DPP-only build

Browse source 
Fix CONFIG_DPP=y build for cases where the needed dependencies were not
pulled in by other optional build parameters.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2019-09-08 17:38:53 +03:00
parent 7d2ed8bae8
commit d2bae5763d
2 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
wpa_supplicant/Android.mk
View file

@ -93,6 +93,7 @@ OBJS += src/utils/common.c
OBJS += src/utils/wpa_debug.c OBJS += src/utils/wpa_debug.c
OBJS += src/utils/wpabuf.c OBJS += src/utils/wpabuf.c
OBJS += src/utils/bitfield.c OBJS += src/utils/bitfield.c
OBJS += src/utils/ip_addr.c
OBJS += wmm_ac.c OBJS += wmm_ac.c
OBJS += op_classes.c OBJS += op_classes.c
OBJS += rrm.c OBJS += rrm.c
@ -244,6 +245,7 @@ NEED_HMAC_SHA384_KDF=y
NEED_HMAC_SHA512_KDF=y NEED_HMAC_SHA512_KDF=y
NEED_SHA384=y NEED_SHA384=y
NEED_SHA512=y NEED_SHA512=y
NEED_ECC=y
NEED_JSON=y NEED_JSON=y
NEED_GAS_SERVER=y NEED_GAS_SERVER=y
NEED_BASE64=y NEED_BASE64=y
@ -837,7 +839,6 @@ OBJS += src/ap/wpa_auth_glue.c
OBJS += src/ap/utils.c OBJS += src/ap/utils.c
OBJS += src/ap/authsrv.c OBJS += src/ap/authsrv.c
OBJS += src/ap/ap_config.c OBJS += src/ap/ap_config.c
OBJS += src/utils/ip_addr.c
OBJS += src/ap/sta_info.c OBJS += src/ap/sta_info.c
OBJS += src/ap/tkip_countermeasures.c OBJS += src/ap/tkip_countermeasures.c
OBJS += src/ap/ap_mlme.c OBJS += src/ap/ap_mlme.c
@ -1602,9 +1603,6 @@ OBJS += wpa_supplicant.c events.c blacklist.c wpas_glue.c scan.c
OBJS_t := $(OBJS) $(OBJS_l2) eapol_test.c OBJS_t := $(OBJS) $(OBJS_l2) eapol_test.c
OBJS_t += src/radius/radius_client.c OBJS_t += src/radius/radius_client.c
OBJS_t += src/radius/radius.c OBJS_t += src/radius/radius.c
ifndef CONFIG_AP
OBJS_t += src/utils/ip_addr.c
endif
OBJS_t2 := $(OBJS) $(OBJS_l2) preauth_test.c OBJS_t2 := $(OBJS) $(OBJS_l2) preauth_test.c
OBJS += $(CONFIG_MAIN).c OBJS += $(CONFIG_MAIN).c

6
wpa_supplicant/Makefile
View file

@ -103,6 +103,7 @@ OBJS += ../src/utils/common.o
OBJS += ../src/utils/wpa_debug.o OBJS += ../src/utils/wpa_debug.o
OBJS += ../src/utils/wpabuf.o OBJS += ../src/utils/wpabuf.o
OBJS += ../src/utils/bitfield.o OBJS += ../src/utils/bitfield.o
OBJS += ../src/utils/ip_addr.o
OBJS += op_classes.o OBJS += op_classes.o
OBJS += rrm.o OBJS += rrm.o
OBJS_p = wpa_passphrase.o OBJS_p = wpa_passphrase.o
@ -276,6 +277,7 @@ NEED_HMAC_SHA384_KDF=y
NEED_HMAC_SHA512_KDF=y NEED_HMAC_SHA512_KDF=y
NEED_SHA384=y NEED_SHA384=y
NEED_SHA512=y NEED_SHA512=y
NEED_ECC=y
NEED_JSON=y NEED_JSON=y
NEED_GAS_SERVER=y NEED_GAS_SERVER=y
NEED_BASE64=y NEED_BASE64=y
@ -883,7 +885,6 @@ OBJS += ../src/ap/wpa_auth_glue.o
OBJS += ../src/ap/utils.o OBJS += ../src/ap/utils.o
OBJS += ../src/ap/authsrv.o OBJS += ../src/ap/authsrv.o
OBJS += ../src/ap/ap_config.o OBJS += ../src/ap/ap_config.o
OBJS += ../src/utils/ip_addr.o
OBJS += ../src/ap/sta_info.o OBJS += ../src/ap/sta_info.o
OBJS += ../src/ap/tkip_countermeasures.o OBJS += ../src/ap/tkip_countermeasures.o
OBJS += ../src/ap/ap_mlme.o OBJS += ../src/ap/ap_mlme.o
@ -1777,9 +1778,6 @@ OBJS += wpa_supplicant.o events.o blacklist.o wpas_glue.o scan.o
OBJS_t := $(OBJS) $(OBJS_l2) eapol_test.o OBJS_t := $(OBJS) $(OBJS_l2) eapol_test.o
OBJS_t += ../src/radius/radius_client.o OBJS_t += ../src/radius/radius_client.o
OBJS_t += ../src/radius/radius.o OBJS_t += ../src/radius/radius.o
ifndef CONFIG_AP
OBJS_t += ../src/utils/ip_addr.o
endif
OBJS_t2 := $(OBJS) $(OBJS_l2) preauth_test.o OBJS_t2 := $(OBJS) $(OBJS_l2) preauth_test.o
OBJS_nfc := $(OBJS) $(OBJS_l2) nfc_pw_token.o OBJS_nfc := $(OBJS) $(OBJS_l2) nfc_pw_token.o