From 9c12805bf3341becb4ff647bdfbfe5318e379468 Mon Sep 17 00:00:00 2001
From: Manuel Novoa III <mjn3@codepoet.org>
Date: Fri, 5 Mar 2004 19:06:24 +0000
Subject: Make it possible to use the (modified) 0.9.24 ldso code.  This is a
 temporary work around for my openwrt stuff since the current (.26+) code
 still isn't working in some cases... for me at least.

---
 make/uclibc.mk | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'make/uclibc.mk')

diff --git a/make/uclibc.mk b/make/uclibc.mk
index 22db81341..ff857aa49 100644
--- a/make/uclibc.mk
+++ b/make/uclibc.mk
@@ -44,6 +44,9 @@ 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
 	touch $(UCLIBC_DIR)/.unpacked
 
 $(UCLIBC_DIR)/.configured: $(UCLIBC_DIR)/.unpacked $(LINUX_DIR)/.configured
@@ -91,6 +94,15 @@ $(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