X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=package%2Fbroadcom-wl%2FMakefile;h=78ea2a04be72d54021a0aeb1ca45c6c961063b12;hp=b60d184fcf51c72827fc556c9603dca047b402a0;hb=efa4f944363ae632afee1d9bb185391558ba56c9;hpb=178721f76bf6e298b36f6cbfc725ea3ce689a57c

diff --git a/package/broadcom-wl/Makefile b/package/broadcom-wl/Makefile
index b60d184fcf..78ea2a04be 100644
--- a/package/broadcom-wl/Makefile
+++ b/package/broadcom-wl/Makefile
@@ -1,22 +1,21 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=broadcom-wl
-PKG_VERSION:=4.150.10.5
-PKG_RELEASE:=1
-WLC_VERSION:=0.1
+PKG_VERSION:=4.150.10.5.3
+PKG_RELEASE:=8
+WLC_VERSION:=0.2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://downloads.openwrt.org/sources
-PKG_MD5SUM:=0c6ba9687114c6b598e8019e262d9a60
+PKG_MD5SUM:=cc615fd49719eea8bce5b2a8813783f3
 
 WL_WEXT=1
 
@@ -99,17 +98,9 @@ define Package/wlc/description
  wl driver.
 endef
 
-define Package/brcm-compat-ldso
-  TITLE:=Broadcom wl/nas binary compatibility libraries
-  DEPENDS:=@TARGET_brcm_2_4
-  SECTION:=libs
-  CATEGORY:=Libraries
-endef
-
 define Package/wl
 $(call Package/broadcom-wl/Default)
   TITLE:=Proprietary Broadcom wl driver config utility
-#  DEPENDS+=+brcm-compat-ldso
 endef
 
 define Package/wl/description
@@ -119,8 +110,6 @@ endef
 
 define Package/nas
 $(call Package/broadcom-wl/Default)
-  DEPENDS+= +nvram
-#  DEPENDS+= +brcm-compat-ldso
   TITLE:=Proprietary Broadcom WPA/WPA2 authenticator
 endef
 
@@ -159,22 +148,31 @@ define Build/Compile
 		$(if $(WL_WEXT),WL_WEXT=1) \
 		modules
 
+	# NVRAM stub
+	$(TARGET_CC) $(TARGET_CFLAGS) -c -o $(PKG_BUILD_DIR)/nvram/nvram_stub.o $(PKG_BUILD_DIR)/nvram/nvram_stub.c
+
 	# Compile wlc
 	$(MAKE) -C $(PKG_BUILD_DIR)/wlc \
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS)" \
 		all
-	$(TARGET_CC) -o $(PKG_BUILD_DIR)/nas $(PKG_BUILD_DIR)/nas_exe.o -L$(STAGING_DIR)/usr/lib -lnvram
+
+	# Compile libshared
+	$(MAKE) -C $(PKG_BUILD_DIR)/router/shared \
+		$(TARGET_CONFIGURE_OPTS) \
+		CFLAGS="$(TARGET_CFLAGS) -I. -I$(PKG_BUILD_DIR)/include -Dlinux=1" \
+		all
+	$(TARGET_CC) -o $(PKG_BUILD_DIR)/nas \
+		$(PKG_BUILD_DIR)/nas_exe.o \
+		$(PKG_BUILD_DIR)/nvram/nvram_stub.o \
+		$(TARGET_LDFLAGS) \
+		$(PKG_BUILD_DIR)/router/shared/libshared.a
 	$(TARGET_CC) -o $(PKG_BUILD_DIR)/wl $(PKG_BUILD_DIR)/wl_exe.o
-#	$(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
 endef
 
-define Package/brcm-compat-ldso/install
-	$(INSTALL_DIR) $(1)/lib
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ld-uClibc.brcm $(1)/lib/
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/router/shared/libshared.a $(1)/usr/lib/
 endef
 
 define Package/wlc/install
@@ -197,7 +195,6 @@ endef
 
 $(eval $(call KernelPackage,brcm-wl))
 $(eval $(call KernelPackage,brcm-wl-mimo))
-#$(eval $(call BuildPackage,brcm-compat-ldso))
 $(eval $(call KernelPackage,wlcompat))
 $(eval $(call KernelPackage,wlcompat-debug))
 $(eval $(call BuildPackage,wlc))