* big updates in uclibc building sheme

git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunk@785 33e552b5-05e3-0310-8538-816dae2090ed

1 files changed, 32 insertions, 42 deletions

diff --git a/rules/uclibc.make b/rules/uclibc.make
index e1b444aa4..1ce7118f0 100644
--- a/rules/uclibc.make
+++ b/rules/uclibc.make
@@ -1,7 +1,8 @@
 # -*-makefile-*-
-# $Id: uclibc.make,v 1.4 2003/10/23 15:01:19 mkl Exp $
+# $Id: uclibc.make,v 1.5 2003/11/17 03:36:57 mkl Exp $
 #
 # Copyright (C) 2003 by Marc Kleine-Budde <kleine-budde@gmx.de>
+#
 # See CREDITS for details about who has contributed to this project.
 #
 # For further information about the PTXdist project and license conditions
@@ -12,20 +13,15 @@
 # We provide this package
 #
 ifdef PTXCONF_UCLIBC
+ifdef PTXCONF_BUILD_CROSSCHAIN
 PACKAGES	+= uclibc
+endif
 DYNAMIC_LINKER	=  /lib/ld-uClibc.so.0
 endif
 
 #
 # Paths and names
 #
-ifdef PTXCONF_UCLIBC_0_9_19
-UCLIBC_VERSION			= 0.9.19
-endif
-ifdef PTXCONF_UCLIBC_0_9_20
-UCLIBC_VERSION			= 0.9.20
-endif
-
 UCLIBC_SUFFIX			= tar.bz2
 UCLIBC				= uClibc-$(UCLIBC_VERSION)
 UCLIBC_URL			= http://www.uclibc.org/downloads/$(UCLIBC).$(UCLIBC_SUFFIX)
@@ -68,7 +64,7 @@ uclibc_fix_config_general =								\
 
 uclibc_get: $(STATEDIR)/uclibc.get
 
-uclibc_get_deps =  $(UCLIBC_SOURCE)
+uclibc_get_deps = $(UCLIBC_SOURCE)
 
 $(STATEDIR)/uclibc.get: $(uclibc_get_deps)
 	@$(call targetinfo, $@)
@@ -107,10 +103,9 @@ UCLIBC_MAKEVARS	= CROSS=$(PTXCONF_GNU_TARGET)- HOSTCC=$(HOSTCC)
 # dependencies
 #
 uclibc_prepare_deps = \
-	$(STATEDIR)/virtual-xchain.install \
+	$(STATEDIR)/xchain-gccstage1.install \
 	$(STATEDIR)/uclibc.extract
 
-
 $(STATEDIR)/uclibc.prepare: $(uclibc_prepare_deps)
 	@$(call targetinfo, $@)
 
@@ -118,7 +113,9 @@ $(STATEDIR)/uclibc.prepare: $(uclibc_prepare_deps)
 	perl -i -p -e 's/PTXCONF_UCLIBC_//g' $(UCLIBC_DIR)/.config
 	@$(call uclibc_fix_config, $(UCLIBC_DIR)/.config)
 
-	$(UCLIBC_PATH) make -C $(UCLIBC_DIR) oldconfig $(UCLIBC_MAKEVARS)
+	$(UCLIBC_PATH) make -C $(UCLIBC_DIR) \
+		$(UCLIBC_MAKEVARS) \
+		oldconfig
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -127,7 +124,7 @@ $(STATEDIR)/uclibc.prepare: $(uclibc_prepare_deps)
 
 uclibc_compile: $(STATEDIR)/uclibc.compile
 
-uclibc_compile_deps =  $(STATEDIR)/uclibc.prepare
+uclibc_compile_deps = $(STATEDIR)/uclibc.prepare
 
 $(STATEDIR)/uclibc.compile: $(uclibc_compile_deps)
 	@$(call targetinfo, $@)
@@ -140,8 +137,11 @@ $(STATEDIR)/uclibc.compile: $(uclibc_compile_deps)
 
 uclibc_install: $(STATEDIR)/uclibc.install
 
-$(STATEDIR)/uclibc.install:
+$(STATEDIR)/uclibc.install: $(STATEDIR)/uclibc.compile
 	@$(call targetinfo, $@)
+	$(UCLIBC_PATH) make -C  $(UCLIBC_DIR) \
+		$(UCLIBC_MAKEVARS) TARGET_ARCH=$(SHORT_TARGET) \
+		install_dev install_runtime install_utils
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -150,58 +150,48 @@ $(STATEDIR)/uclibc.install:
 
 uclibc_targetinstall: $(STATEDIR)/uclibc.targetinstall
 
-$(STATEDIR)/uclibc.targetinstall: $(STATEDIR)/uclibc.compile
+ifdef PTXCONF_BUILD_CROSSCHAIN
+uclibc_targetinstall_deps = $(STATEDIR)/uclibc.install
+endif
+
+$(STATEDIR)/uclibc.targetinstall: $(uclibc_targetinstall_deps)
 	@$(call targetinfo, $@)
 	mkdir -p $(ROOTDIR)/lib
 
-	install $(UCLIBC_DIR)/lib/ld-uClibc-$(UCLIBC_VERSION).so \
-		$(ROOTDIR)/lib/ld-uClibc-$(UCLIBC_VERSION).so
-	ln -sf ld-uClibc-$(UCLIBC_VERSION).so $(ROOTDIR)/lib/ld-uClibc.so.0
+	cp -d $(CROSS_LIB_DIR)/lib/ld-uClibc[-.]*so* $(ROOTDIR)/lib/
 
-	install $(UCLIBC_DIR)/lib/libuClibc-$(UCLIBC_VERSION).so \
-		$(ROOTDIR)/lib/libuClibc-$(UCLIBC_VERSION).so
-	ln -sf libuClibc-$(UCLIBC_VERSION).so $(ROOTDIR)/lib/libc.so.0
+	cp -d $(CROSS_LIB_DIR)/lib/libuClibc[-.]*so* $(ROOTDIR)/lib/
+	cd $(CROSS_LIB_DIR)/lib && \
+		ln -sf libuClibc-*.so $(ROOTDIR)/lib/libc.so
+	cd $(CROSS_LIB_DIR)/lib && \
+		ln -sf libuClibc-*.so $(ROOTDIR)/lib/libc.so.0
 
 ifdef PTXCONF_UCLIBC_CRYPT
-	install $(UCLIBC_DIR)/lib/libcrypt-$(UCLIBC_VERSION).so \
-		$(ROOTDIR)/lib/libcrypt-$(UCLIBC_VERSION).so
-	ln -sf libcrypt-$(UCLIBC_VERSION).so $(ROOTDIR)/lib/libcrypt.so.0
+	cp -d $(CROSS_LIB_DIR)/lib/libcrypt[-.]*so* $(ROOTDIR)/lib/
 endif
 
 ifdef PTXCONF_UCLIBC_DL
-	install $(UCLIBC_DIR)/lib/libdl-$(UCLIBC_VERSION).so \
-		$(ROOTDIR)/lib/libdl-$(UCLIBC_VERSION).so
-	ln -sf libdl-$(UCLIBC_VERSION).so $(ROOTDIR)/lib/libdl.so.0
+	cp -d $(CROSS_LIB_DIR)/lib/libdl[-.]*so* $(ROOTDIR)/lib/
 endif
 
 ifdef PTXCONF_UCLIBC_M
-	install $(UCLIBC_DIR)/lib/libm-$(UCLIBC_VERSION).so \
-		$(ROOTDIR)/lib/libm-$(UCLIBC_VERSION).so
-	ln -sf libm-$(UCLIBC_VERSION).so $(ROOTDIR)/lib/libm.so.0
+	cp -d $(CROSS_LIB_DIR)/lib/libm[-.]*so* $(ROOTDIR)/lib/
 endif
 
 ifdef PTXCONF_UCLIBC_NSL
-	install $(UCLIBC_DIR)/lib/libnsl-$(UCLIBC_VERSION).so \
-		$(ROOTDIR)/lib/libnsl-$(UCLIBC_VERSION).so
-	ln -sf libnsl-$(UCLIBC_VERSION).so $(ROOTDIR)/lib/libnsl.so.0
+	cp -d $(CROSS_LIB_DIR)/lib/libnsl[-.]*so* $(ROOTDIR)/lib/
 endif
 
 ifdef PTXCONF_UCLIBC_PTHREAD
-	install $(UCLIBC_DIR)/lib/libpthread-$(UCLIBC_VERSION).so \
-		$(ROOTDIR)/lib/libpthread-$(UCLIBC_VERSION).so
-	ln -sf libpthread-$(UCLIBC_VERSION).so $(ROOTDIR)/lib/libpthread.so.0
+	cp -d $(CROSS_LIB_DIR)/lib/libpthread[-.]*so* $(ROOTDIR)/lib/
 endif
 
 ifdef PTXCONF_UCLIBC_RESOLV
-	install $(UCLIBC_DIR)/lib/libresolv-$(UCLIBC_VERSION).so \
-		$(ROOTDIR)/lib/libresolv-$(UCLIBC_VERSION).so
-	ln -sf libresolv-$(UCLIBC_VERSION).so $(ROOTDIR)/lib/libresolv.so.0
+	cp -d $(CROSS_LIB_DIR)/lib/libresolv[-.]*so* $(ROOTDIR)/lib/
 endif
 
 ifdef PTXCONF_UCLIBC_UTIL
-	install $(UCLIBC_DIR)/lib/libutil-$(UCLIBC_VERSION).so \
-		$(ROOTDIR)/lib/libutil-$(UCLIBC_VERSION).so
-	ln -sf libutil-$(UCLIBC_VERSION).so $(ROOTDIR)/lib/libutil.so.0
+	cp -d $(CROSS_LIB_DIR)/lib/libutil[-.]*so* $(ROOTDIR)/lib/
 endif
 	touch $@