Commit a41a29192e5d ("build: Pull common fragments into a build.rules
file") introduced regression into wpa_supplicant build process. Build
target libwpa_client.so is not built regardless of whether the option
CONFIG_BUILD_WPA_CLIENT_SO is set or not. This happens because config
option is used before it is imported from the configuration file.
Moving its usage after including build.rules does not help: variable
ALL is processed by build.rules and further changes are not applied.
Similarly, option CONFIG_NO_WPA_PASSPHRASE also does not work as
expected: wpa_passphrase is always built regardless of whether the
option is set or not.
This commit re-enables options adding both build targets to _all
dependencies.
Signed-off-by: Sergey Matyukevich <geomatsi@xxxxxxxxx>
---
v2 -> v3
- change s-o-b and author
v1 -> v2
- rework as per suggestion by Johannes Berg
wpa_supplicant/Makefile | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile
index cb66defac..e384cc6b8 100644
--- a/wpa_supplicant/Makefile
+++ b/wpa_supplicant/Makefile
@@ -1,24 +1,29 @@
BINALL=wpa_supplicant wpa_cli
-ifndef CONFIG_NO_WPA_PASSPHRASE
-BINALL += wpa_passphrase
-endif
-
ALL = $(BINALL)
ALL += systemd/wpa_supplicant.service
ALL += systemd/wpa_supplicant@.service
ALL += systemd/wpa_supplicant-nl80211@.service
ALL += systemd/wpa_supplicant-wired@.service
ALL += dbus/fi.w1.wpa_supplicant1.service
-ifdef CONFIG_BUILD_WPA_CLIENT_SO
-ALL += libwpa_client.so
-endif
EXTRA_TARGETS=dynamic_eap_methods
CONFIG_FILE=.config
include ../src/build.rules
+ifdef CONFIG_BUILD_WPA_CLIENT_SO
+# add the dependency this way to allow CONFIG_BUILD_WPA_CLIENT_SO
+# being set in the config which is read by build.rules
+_all: libwpa_client.so
+endif
+
+ifndef CONFIG_NO_WPA_PASSPHRASE
+# add the dependency this way to allow CONFIGNO_WPA_PASSPHRASE
+# being set in the config which is read by build.rules
+_all: wpa_passphrase
+endif
+
ifdef LIBS
# If LIBS is set with some global build system defaults, clone those for
# LIBS_c and LIBS_p to cover wpa_passphrase and wpa_cli as well.
--
2.35.1
_______________________________________________
Hostap mailing list
Hostap@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/hostap
