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

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9519 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/broadcom-wl/Makefile b/package/broadcom-wl/Makefile
index ea80e2a..3404142 100644 (file)
--- 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 2ae77d3..47c13bf 100644 (file)
--- 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 a8de762..ca9184d 100644 (file)
--- 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 2b42ecd..dc43e06 100644 (file)
--- 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