From ae5d1e62537d415ef375a1b6484c70a6fd270428 Mon Sep 17 00:00:00 2001
From: Eric Andersen <andersen@codepoet.org>
Date: Tue, 20 Jul 2004 11:43:54 +0000
Subject: Remove the unnecessary USE_UCLIBC_LDSO_0_9_24 option

---
 make/uclibc.mk | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

(limited to 'make/uclibc.mk')

diff --git a/make/uclibc.mk b/make/uclibc.mk
index 5cf69f9af..e0de21a7e 100644
--- a/make/uclibc.mk
+++ b/make/uclibc.mk
@@ -44,9 +44,7 @@ endif
 	#(cd $(BUILD_DIR) ; ln -s $(DL_DIR)/uClibc)
 	#-mkdir $(UCLIBC_DIR)
 	#(cd $(DL_DIR)/uClibc && tar cf - .) | (cd $(UCLIBC_DIR) && tar xvfp - )
-ifeq ($(strip $(USE_UCLIBC_LDSO_0_9_24)),true)
-	$(SOURCE_DIR)/patch-kernel.sh $(UCLIBC_DIR) $(SOURCE_DIR) uClibc-ldso-0.9.24.patch
-endif
+	$(SOURCE_DIR)/patch-kernel.sh $(UCLIBC_DIR) $(SOURCE_DIR) uClibc-*.patch
 	touch $(UCLIBC_DIR)/.unpacked
 
 $(UCLIBC_DIR)/.configured: $(UCLIBC_DIR)/.unpacked $(LINUX_DIR)/.configured
@@ -100,15 +98,6 @@ $(UCLIBC_DIR)/lib/libc.a: $(UCLIBC_DIR)/.configured $(LIBFLOAT_TARGET)
 		RUNTIME_PREFIX=/ \
 		HOSTCC="$(HOSTCC)" \
 		all
-ifeq ($(strip $(USE_UCLIBC_LDSO_0_9_24)),true)
-	#rm -rf $(UCLIBC_DIR)/ld-uClibc* $(UCLIBC_DIR)/libdl*
-	$(MAKE) -C $(UCLIBC_DIR)/ldso-0.9.24 \
-		PREFIX= \
-		DEVEL_PREFIX=$(REAL_GNU_TARGET_NAME)/ \
-		RUNTIME_PREFIX=/ \
-		HOSTCC="$(HOSTCC)" \
-		all shared
-endif
 
 $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/lib/libc.a: $(UCLIBC_DIR)/lib/libc.a
 	$(MAKE) -C $(UCLIBC_DIR) \
-- 
cgit v1.2.3