summaryrefslogtreecommitdiffstats
path: root/package/network/services
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-03-18 16:11:32 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-03-18 16:11:32 +0000
commit9bb50b35bbe198a9d2c4c51a3108dc6f336e6337 (patch)
tree9b7f0c29f028bbe1b11b671fe2c83e04a03f22a3 /package/network/services
parent88fe32ebc86e3b87625c4ca326397cff0933b122 (diff)
hostapd: fix build errors on supplicant-only builds
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36085 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/network/services')
-rw-r--r--package/network/services/hostapd/Makefile4
-rw-r--r--package/network/services/hostapd/patches/700-ubus_support.patch6
2 files changed, 6 insertions, 4 deletions
diff --git a/package/network/services/hostapd/Makefile b/package/network/services/hostapd/Makefile
index 0c44a8b08..7024844d1 100644
--- a/package/network/services/hostapd/Makefile
+++ b/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
diff --git a/package/network/services/hostapd/patches/700-ubus_support.patch b/package/network/services/hostapd/patches/700-ubus_support.patch
index 92ca7b21c..ad1a45bf3 100644
--- a/package/network/services/hostapd/patches/700-ubus_support.patch
+++ b/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;
+};