From 26fecaf49101a9060bdddba1ee9d319597d90f0c Mon Sep 17 00:00:00 2001 From: nbd Date: Fri, 9 Nov 2007 03:20:13 +0000 Subject: disable crt_fini compatibility in uClibc, compile custom ld-uClibc for broadcom utilities allows us to upgrade uClibc without breaking compatibility for nas and wl breaks binary compatibility for packages from earlier kamikaze releases git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9518 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/broadcom-wl/Makefile | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) (limited to 'package/broadcom-wl/Makefile') diff --git a/package/broadcom-wl/Makefile b/package/broadcom-wl/Makefile index f468646ce..ea80e2ad9 100644 --- a/package/broadcom-wl/Makefile +++ b/package/broadcom-wl/Makefile @@ -70,9 +70,16 @@ define Package/wlc/description wl driver. endef +define Package/brcm-compat-ldso + TITLE:=Broadcom wl/nas binary compatibility libraries + 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 @@ -82,7 +89,7 @@ endef define Package/nas $(call Package/broadcom-wl/Default) - DEPENDS+= +nvram + DEPENDS+= +nvram +brcm-compat-ldso TITLE:=Proprietary Broadcom WPA/WPA2 authenticator endef @@ -128,6 +135,15 @@ define Build/Compile $(TARGET_CONFIGURE_OPTS) \ CFLAGS="-I$(PKG_BUILD_DIR)/wlc/include $(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 +endef + +define Package/brcm-compat-ldso/install + $(INSTALL_DIR) $(1)/lib + $(INSTALL_BIN) $(PKG_BUILD_DIR)/ld-uClibc.brcm $(1)/lib/ endef define Package/wlc/install @@ -152,6 +168,7 @@ endef $(eval $(call KernelPackage,brcm-wl)) $(eval $(call KernelPackage,brcm-wl-mimo)) +$(eval $(call BuildPackage,brcm-compat-ldso)) $(eval $(call BuildPackage,wlc)) $(eval $(call BuildPackage,wl)) $(eval $(call BuildPackage,nas)) -- cgit v1.2.3