From: Felix Fietkau <nbd@openwrt.org>
Date: Fri, 9 Nov 2007 13:20:21 +0000 (+0000)
Subject: revert abi changes in uClibc - on hold for 7.11, will be added again with the uclibc... 
X-Git-Tag: v19.07.0-rc1~38322
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=1423753198ca023ff0c6ce7b62b24990aa925905;p=openwrt%2Fstaging%2Fhauke.git

revert abi changes in uClibc - on hold for 7.11, will be added again with the uclibc upgrade for 8.01

SVN-Revision: 9519
---

diff --git a/package/broadcom-wl/Makefile b/package/broadcom-wl/Makefile
index ea80e2ad90..340414231b 100644
--- a/package/broadcom-wl/Makefile
+++ b/package/broadcom-wl/Makefile
@@ -135,10 +135,10 @@ 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
+#	$(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
@@ -168,7 +168,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 BuildPackage,wlc))
 $(eval $(call BuildPackage,wl))
 $(eval $(call BuildPackage,nas))
diff --git a/toolchain/uClibc/config/mips b/toolchain/uClibc/config/mips
index 2ae77d309f..47c13bffad 100644
--- a/toolchain/uClibc/config/mips
+++ b/toolchain/uClibc/config/mips
@@ -70,7 +70,7 @@ LDSO_CACHE_SUPPORT=y
 # LDSO_PRELOAD_FILE_SUPPORT is not set
 LDSO_BASE_FILENAME="ld.so"
 LDSO_RUNPATH=y
-# DL_FINI_CRT_COMPAT is not set
+DL_FINI_CRT_COMPAT=y
 UCLIBC_CTOR_DTOR=y
 # HAS_NO_THREADS is not set
 UCLIBC_HAS_THREADS=y
diff --git a/toolchain/uClibc/config/mipsel b/toolchain/uClibc/config/mipsel
index a8de762057..ca9184dd61 100644
--- a/toolchain/uClibc/config/mipsel
+++ b/toolchain/uClibc/config/mipsel
@@ -70,7 +70,7 @@ LDSO_CACHE_SUPPORT=y
 # LDSO_PRELOAD_FILE_SUPPORT is not set
 LDSO_BASE_FILENAME="ld.so"
 LDSO_RUNPATH=y
-# DL_FINI_CRT_COMPAT is not set
+DL_FINI_CRT_COMPAT=y
 UCLIBC_CTOR_DTOR=y
 # HAS_NO_THREADS is not set
 UCLIBC_HAS_THREADS=y
diff --git a/toolchain/uClibc/config/powerpc b/toolchain/uClibc/config/powerpc
index 2b42ecd70f..dc43e06444 100644
--- a/toolchain/uClibc/config/powerpc
+++ b/toolchain/uClibc/config/powerpc
@@ -68,7 +68,7 @@ LDSO_CACHE_SUPPORT=y
 # LDSO_PRELOAD_FILE_SUPPORT is not set
 LDSO_BASE_FILENAME="ld.so"
 LDSO_RUNPATH=y
-# DL_FINI_CRT_COMPAT is not set
+DL_FINI_CRT_COMPAT=y
 UCLIBC_CTOR_DTOR=y
 # HAS_NO_THREADS is not set
 UCLIBC_HAS_THREADS=y