aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2007-11-16 03:11:42 +0000
committerFelix Fietkau <nbd@openwrt.org>2007-11-16 03:11:42 +0000
commit5a543584b8b7f0d512979db826b998c2b32add65 (patch)
tree403c31de4c137e673fbf120492b39a75478396f6
parent11feaad40ab4f13cd8440a918f953ca730571cca (diff)
downloadupstream-5a543584b8b7f0d512979db826b998c2b32add65.tar.gz
upstream-5a543584b8b7f0d512979db826b998c2b32add65.tar.bz2
upstream-5a543584b8b7f0d512979db826b998c2b32add65.zip
improve build checks for hostapd (combinations of madwifi and mac80211)
SVN-Revision: 9563
-rw-r--r--package/hostapd/Makefile7
1 files changed, 4 insertions, 3 deletions
diff --git a/package/hostapd/Makefile b/package/hostapd/Makefile
index 34dbfe2f6f..322f881781 100644
--- a/package/hostapd/Makefile
+++ b/package/hostapd/Makefile
@@ -20,6 +20,7 @@ PKG_SOURCE_VERSION:=$(PKG_REV)
PKG_BUILD_DEPENDS:=madwifi mac80211
include $(INCLUDE_DIR)/package.mk
+STAMP_CONFIGURED:=$(STAMP_CONFIGURED)_$(call confvar,PACKAGE_kmod-mac80211 PACKAGE_kmod-madwifi)
define Package/hostapd/Default
SECTION:=net
@@ -73,8 +74,8 @@ define Build/ConfigureTarget
rm -rf $(PKG_BUILD_DIR)/hostapd.$(1)
$(CP) $(PKG_BUILD_DIR)/hostapd $(PKG_BUILD_DIR)/hostapd.$(1)
$(CP) ./files/$(1).config $(PKG_BUILD_DIR)/hostapd.$(1)/.config
- [ -d $(STAGING_DIR)/usr/include/mac80211 ] || $(SED) 's,^CONFIG_DRIVER_DEVICESCAPE,#CONFIG_DRIVER_DEVICESCAPE,g' $(PKG_BUILD_DIR)/hostapd.$(1)/.config
- [ -d $(STAGING_DIR)/usr/include/madwifi ] || $(SED) 's,^CONFIG_DRIVER_MADWIFI,#CONFIG_DRIVER_MADWIFI,g' $(PKG_BUILD_DIR)/hostapd.$(1)/.config
+ $(if $(CONFIG_PACKAGE_kmod-mac80211),,$(SED) 's,^CONFIG_DRIVER_DEVICESCAPE,#CONFIG_DRIVER_DEVICESCAPE,g' $(PKG_BUILD_DIR)/hostapd.$(1)/.config)
+ $(if $(CONFIG_PACKAGE_kmod-madwifi),,$(SED) 's,^CONFIG_DRIVER_MADWIFI,#CONFIG_DRIVER_MADWIFI,g' $(PKG_BUILD_DIR)/hostapd.$(1)/.config)
endef
define Build/CompileTarget
@@ -82,7 +83,7 @@ define Build/CompileTarget
$(MAKE) -C $(PKG_BUILD_DIR)/hostapd.$(1) \
$(TARGET_CONFIGURE_OPTS) \
LIBS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib \
- $(if $(wildcard $(STAGING_DIR)/usr/include/mac80211/*),-lm $(STAGING_DIR)/usr/lib/libnl.a)" \
+ $(if $(CONFIG_PACKAGE_kmod-mac80211),-lm $(STAGING_DIR)/usr/lib/libnl.a)" \
hostapd hostapd_cli
$(CP) $(PKG_BUILD_DIR)/hostapd.$(1)/hostapd_cli $(PKG_BUILD_DIR)/
endef