Просмотр исходного кода

hostapd: fix build errors on supplicant-only builds

SVN-Revision: 36085
Felix Fietkau 12 лет назад
Родитель
Сommit
31876c193a

+ 3 - 1
package/network/services/hostapd/Makefile

@@ -225,7 +225,9 @@ TARGET_CPPFLAGS := \
 
 TARGET_CFLAGS += -ffunction-sections -fdata-sections
 TARGET_LDFLAGS += -Wl,--gc-sections
-TARGET_LDFLAGS += -lubox -lubus
+ifeq ($(findstring supplicant,$(BUILD_VARIANT)),)
+  TARGET_LDFLAGS += -lubox -lubus
+endif
 
 ifdef CONFIG_PACKAGE_kmod-mac80211
   TARGET_LDFLAGS += -lm -lnl-tiny

+ 3 - 3
package/network/services/hostapd/patches/700-ubus_support.patch

@@ -422,14 +422,14 @@
 +	const u8 *addr;
 +};
 +
++struct hostapd_iface;
++struct hostapd_data;
++
 +#ifdef UBUS_SUPPORT
 +
 +#include <libubox/avl.h>
 +#include <libubus.h>
 +
-+struct hostapd_iface;
-+struct hostapd_data;
-+
 +struct hostapd_ubus_iface {
 +	struct ubus_object obj;
 +};