hostapd: update to 2023-03-29

[openwrt/staging/dedeckeh.git] / package / network / services / hostapd / patches / 500-lto-jobserver-support.patch

diff --git a/package/network/services/hostapd/patches/500-lto-jobserver-support.patch b/package/network/services/hostapd/patches/500-lto-jobserver-support.patch
index 1edfb8e804dd60add1ae5ebe62a89476a9b27205..046da42ab8b912c3a2bc6fde312ba7897132e3f3 100644 (file)
--- a/package/network/services/hostapd/patches/500-lto-jobserver-support.patch
+++ b/package/network/services/hostapd/patches/500-lto-jobserver-support.patch
@@ -1,16 +1,17 @@
 --- a/hostapd/Makefile
 +++ b/hostapd/Makefile
-@@ -1332,14 +1332,14 @@ hostapd_multi.a: $(BCHECK) $(OBJS)
+@@ -1396,7 +1396,7 @@ hostapd_multi.a: $(BCHECK) $(OBJS)
        @$(AR) cr $@ hostapd_multi.o $(OBJS)
  
- hostapd: $(BCHECK) $(OBJS)
+ hostapd: $(OBJS)
 -      $(Q)$(CC) $(LDFLAGS) -o hostapd $(OBJS) $(LIBS)
 +      +$(Q)$(CC) $(LDFLAGS) -o hostapd $(OBJS) $(LIBS)
        @$(E) "  LD " $@
  
  ifdef CONFIG_WPA_TRACE
- OBJS_c += ../src/utils/trace.o
- endif
+@@ -1407,7 +1407,7 @@ _OBJS_VAR := OBJS_c
+ include ../src/objs.mk
+ 
  hostapd_cli: $(OBJS_c)
 -      $(Q)$(CC) $(LDFLAGS) -o hostapd_cli $(OBJS_c) $(LIBS_c)
 +      +$(Q)$(CC) $(LDFLAGS) -o hostapd_cli $(OBJS_c) $(LIBS_c)
@@ -19,7 +20,7 @@
  NOBJS = nt_password_hash.o ../src/crypto/ms_funcs.o $(SHA1OBJS)
 --- a/wpa_supplicant/Makefile
 +++ b/wpa_supplicant/Makefile
-@@ -1932,23 +1932,23 @@ wpa_supplicant_multi.a: .config $(BCHECK
+@@ -2039,31 +2039,31 @@ wpa_supplicant_multi.a: .config $(BCHECK
        @$(AR) cr $@ wpa_supplicant_multi.o $(OBJS)
  
  wpa_supplicant: $(BCHECK) $(OBJS) $(EXTRA_progs)
@@ -27,21 +28,29 @@
 +      +$(Q)$(LDO) $(LDFLAGS) -o wpa_supplicant $(OBJS) $(LIBS) $(EXTRALIBS)
        @$(E) "  LD " $@
  
+ _OBJS_VAR := OBJS_t
+ include ../src/objs.mk
  eapol_test: $(OBJS_t)
 -      $(Q)$(LDO) $(LDFLAGS) -o eapol_test $(OBJS_t) $(LIBS)
 +      +$(Q)$(LDO) $(LDFLAGS) -o eapol_test $(OBJS_t) $(LIBS)
        @$(E) "  LD " $@
  
+ _OBJS_VAR := OBJS_t2
+ include ../src/objs.mk
  preauth_test: $(OBJS_t2)
 -      $(Q)$(LDO) $(LDFLAGS) -o preauth_test $(OBJS_t2) $(LIBS)
 +      +$(Q)$(LDO) $(LDFLAGS) -o preauth_test $(OBJS_t2) $(LIBS)
        @$(E) "  LD " $@
  
+ _OBJS_VAR := OBJS_p
+ include ../src/objs.mk
  wpa_passphrase: $(OBJS_p)
 -      $(Q)$(LDO) $(LDFLAGS) -o wpa_passphrase $(OBJS_p) $(LIBS_p) $(LIBS)
 +      +$(Q)$(LDO) $(LDFLAGS) -o wpa_passphrase $(OBJS_p) $(LIBS_p) $(LIBS)
        @$(E) "  LD " $@
  
+ _OBJS_VAR := OBJS_c
+ include ../src/objs.mk
  wpa_cli: $(OBJS_c)
 -      $(Q)$(LDO) $(LDFLAGS) -o wpa_cli $(OBJS_c) $(LIBS_c)
 +      +$(Q)$(LDO) $(LDFLAGS) -o wpa_cli $(OBJS_c) $(LIBS_c)