Force broadcom-compat-ldso to be 2.4 only (#2963)

[openwrt.git] / package / broadcom-wl / Makefile

diff --git a/package/broadcom-wl/Makefile b/package/broadcom-wl/Makefile
index 5905fb1..8c68e8e 100644 (file)
--- a/package/broadcom-wl/Makefile
+++ b/package/broadcom-wl/Makefile
@@ -31,7 +31,7 @@ endef
 define KernelPackage/brcm-wl/Default
   $(call Package/broadcom-wl/Default)
   SECTION:=kernel
-  DEPENDS:=@TARGET_brcm_2_4
+  DEPENDS:=@TARGET_brcm_2_4 +wireless-tools
   TITLE:=Kernel driver for BCM43xx chipsets
   FILES:=$(PKG_BUILD_DIR)/driver/wl$(1).o
   AUTOLOAD:=$(call AutoLoad,30,wl$(1))
@@ -99,6 +99,7 @@ endef
 
 define Package/brcm-compat-ldso
   TITLE:=Broadcom wl/nas binary compatibility libraries
+  DEPENDS:=@TARGET_brcm_2_4
   SECTION:=libs
   CATEGORY:=Libraries
 endef
@@ -116,7 +117,8 @@ endef
 
 define Package/nas
 $(call Package/broadcom-wl/Default)
-  DEPENDS+= +nvram +brcm-compat-ldso
+  DEPENDS+= +nvram
+  DEPENDS+= +brcm-compat-ldso
   TITLE:=Proprietary Broadcom WPA/WPA2 authenticator
 endef
 
@@ -173,10 +175,10 @@ define Build/Compile
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS)" \
                all
-#      $(NO_TRACE_MAKE) -C compat-ldso -f build.mk PKG_INSTALL_DIR="$(PKG_BUILD_DIR)"
-#      $(SED) 's,ld-uClibc.so.0,ld-uClibc.brcm,' \
-#              $(PKG_BUILD_DIR)/wl \
-#              $(PKG_BUILD_DIR)/nas
+       $(NO_TRACE_MAKE) -C compat-ldso -f build.mk PKG_INSTALL_DIR="$(PKG_BUILD_DIR)" BUILD_DIR="$(PKG_BUILD_DIR)"
+       $(SED) 's,ld-uClibc.so.0,ld-uClibc.brcm,' \
+               $(PKG_BUILD_DIR)/wl \
+               $(PKG_BUILD_DIR)/nas
 endef
 
 define Package/brcm-compat-ldso/install
@@ -206,7 +208,7 @@ endef
 
 $(eval $(call KernelPackage,brcm-wl))
 $(eval $(call KernelPackage,brcm-wl-mimo))
-#$(eval $(call BuildPackage,brcm-compat-ldso))
+$(eval $(call BuildPackage,brcm-compat-ldso))
 $(eval $(call KernelPackage,wlcompat))
 $(eval $(call KernelPackage,wlcompat-debug))
 $(eval $(call BuildPackage,wlc))