hostapd: adjust patches to work with git am

[openwrt/staging/xback.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 223c43cfde15a0b84e9e2cfdbb7b7d399e5af7b0..f7f071fb0ec9bb4f172e250c5d3510c50568b9ea 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,22 @@
+From: Felix Fietkau <nbd@nbd.name>
+Date: Tue, 10 Jul 2018 13:48:17 +0200
+Subject: [PATCH] hostapd: build with LTO enabled (using jobserver for parallel
+ build)
+
 --- a/hostapd/Makefile
 +++ b/hostapd/Makefile
-@@ -1316,14 +1316,14 @@ hostapd_multi.a: $(BCHECK) $(OBJS)
+@@ -1408,7 +1408,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
+@@ -1419,7 +1419,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 +25,7 @@
  NOBJS = nt_password_hash.o ../src/crypto/ms_funcs.o $(SHA1OBJS)
 --- a/wpa_supplicant/Makefile
 +++ b/wpa_supplicant/Makefile
-@@ -1926,23 +1926,23 @@ wpa_supplicant_multi.a: .config $(BCHECK
+@@ -2106,31 +2106,31 @@ wpa_supplicant_multi.a: .config $(BCHECK
        @$(AR) cr $@ wpa_supplicant_multi.o $(OBJS)
  
  wpa_supplicant: $(BCHECK) $(OBJS) $(EXTRA_progs)
@@ -27,21 +33,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)