From: Felix Fietkau <nbd@openwrt.org>
Date: Thu, 30 Apr 2009 14:38:30 +0000 (+0000)
Subject: iw: use libnl-tiny, forcibly disable git version check
X-Git-Tag: reboot~23790
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=3750e2788d468a6cfa975f0ea9207c46dbc6f9b4;p=openwrt%2Fstaging%2Fblogic.git

iw: use libnl-tiny, forcibly disable git version check

SVN-Revision: 15514
---

diff --git a/package/iw/Makefile b/package/iw/Makefile
index 99550a30fa85..9187b55c8594 100644
--- a/package/iw/Makefile
+++ b/package/iw/Makefile
@@ -14,7 +14,7 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://wireless.kernel.org/download/iw/
 PKG_MD5SUM:=cf9121abb4ffe6dce1691e2ec97d5b2b
-PKG_BUILD_DEPENDS:=mac80211 libnl
+PKG_BUILD_DEPENDS:=mac80211
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -23,16 +23,29 @@ define Package/iw
   CATEGORY:=Network
   TITLE:=cfg80211 interface configuration utility
   URL:=http://wireless.kernel.org/en/users/Documentation/iw
-  DEPENDS:=@!TARGET_avr32 @!TARGET_etrax +libnl
+  DEPENDS:=@!TARGET_avr32 @!TARGET_etrax +libnl-tiny
 endef
 
 define Build/Configure
 	echo "const char iw_version[] = \"$(PKG_VERSION)\";" > $(PKG_BUILD_DIR)/version.c
+	rm -f $(PKG_BUILD_DIR)/version.sh
+	touch $(PKG_BUILD_DIR)/version.sh
+	chmod +x $(PKG_BUILD_DIR)/version.sh
 endef
 
+TARGET_CPPFLAGS:= \
+	-I$(STAGING_DIR)/usr/include/libnl-tiny \
+	-I$(STAGING_DIR)/usr/include/mac80211 \
+	$(TARGET_CPPFLAGS) \
+	-DCONFIG_LIBNL20
+
 MAKE_FLAGS += \
-	CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/mac80211 -I$(STAGING_DIR)/usr/include/libnl $(TARGET_CPPFLAGS)" \
-	LDFLAGS="$(TARGET_LDFLAGS) -lnl"
+	CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" \
+	LDFLAGS="$(TARGET_LDFLAGS)" \
+	NL1FOUND="" NL2FOUND=Y \
+	NLLIBNAME="libnl-tiny" \
+	LIBS="-lm -lnl-tiny" \
+	V=1
 
 ifneq ($(CONFIG_LINUX_2_6),)
   define Package/iw/install