[uClibc-cvs] svn commit: trunk/buildroot: package/strace toolchain toolchain/gdb t etc...

[mjn3 at uclibc.org]

Author: mjn3
Date: 2005-08-03 21:49:25 -0600 (Wed, 03 Aug 2005)
New Revision: 11039

Log:
Add BR2_CROSS_TOOLCHAIN_TARGET_UTILS to allow bundling of some useful debug
apps with a deployed cross toolchain.  Should probably do ltrace as well...
Also, add another compat symlink for cross gdb.


Modified:
   trunk/buildroot/package/strace/strace.mk
   trunk/buildroot/toolchain/Config.in
   trunk/buildroot/toolchain/gdb/gdb.mk
   trunk/buildroot/toolchain/uClibc/uclibc.mk


Changeset:
Modified: trunk/buildroot/package/strace/strace.mk
===================================================================
--- trunk/buildroot/package/strace/strace.mk	2005-08-04 01:49:49 UTC (rev 11038)
+++ trunk/buildroot/package/strace/strace.mk	2005-08-04 03:49:25 UTC (rev 11039)
@@ -49,6 +49,11 @@
 $(TARGET_DIR)/usr/bin/strace: $(STRACE_DIR)/strace
 	install -c $(STRACE_DIR)/strace $(TARGET_DIR)/usr/bin/strace
 	$(STRIP) $(TARGET_DIR)/usr/bin/strace > /dev/null 2>&1
+ifeq ($(strip $(BR2_CROSS_TOOLCHAIN_TARGET_UTILS)),y)
+	mkdir -p $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/target_utils
+	install -c $(TARGET_DIR)/usr/bin/strace \
+		$(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/target_utils/strace
+endif
 
 strace: uclibc $(TARGET_DIR)/usr/bin/strace 
 

Modified: trunk/buildroot/toolchain/Config.in
===================================================================
--- trunk/buildroot/toolchain/Config.in	2005-08-04 01:49:49 UTC (rev 11038)
+++ trunk/buildroot/toolchain/Config.in	2005-08-04 03:49:25 UTC (rev 11039)
@@ -45,6 +45,17 @@
 	help
 	  Optimizations to use when building for the target host.
 
+config BR2_CROSS_TOOLCHAIN_TARGET_UTILS
+	string "Include target utils in cross toolchain."
+	default y
+	help
+	  When using buildroot to build a deployable cross toolchain, it is handy
+	  to include certain target apps with that toolchain as a convenience.
+	  Examples include ldd, gdbserver, and strace.
+
+	  Answer Y if you want these apps (if built) copied into the cross toolchain
+	  dir under <arch>-linux-uclibc/target_utils/.
+
 # Might be worth experimenting with for gcc 3.4.x.
 #GCC_WITH_CPU:=
 #GCC_WITH_ARCH:=

Modified: trunk/buildroot/toolchain/gdb/gdb.mk
===================================================================
--- trunk/buildroot/toolchain/gdb/gdb.mk	2005-08-04 01:49:49 UTC (rev 11038)
+++ trunk/buildroot/toolchain/gdb/gdb.mk	2005-08-04 03:49:25 UTC (rev 11039)
@@ -123,6 +123,11 @@
 	$(STRIP) $(GDB_SERVER_DIR)/gdbserver
 
 $(TARGET_DIR)/usr/bin/gdbserver: $(GDB_SERVER_DIR)/gdbserver
+ifeq ($(strip $(BR2_CROSS_TOOLCHAIN_TARGET_UTILS)),y)
+	mkdir -p $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/target_utils
+	install -c $(GDB_SERVER_DIR)/gdbserver \
+		$(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/target_utils/gdbserver
+endif
 	install -c $(GDB_SERVER_DIR)/gdbserver $(TARGET_DIR)/usr/bin/gdbserver
 
 gdbserver: $(TARGET_DIR)/usr/bin/gdbserver
@@ -164,8 +169,10 @@
 
 $(TARGET_CROSS)gdb: $(GDB_CLIENT_DIR)/gdb/gdb
 	install -c $(GDB_CLIENT_DIR)/gdb/gdb $(TARGET_CROSS)gdb
-	ln -fs ../../bin/$(REAL_GNU_TARGET_NAME)-gdb \
+	ln -snf ../../bin/$(REAL_GNU_TARGET_NAME)-gdb \
 		$(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/bin/gdb
+	ln -snf $(REAL_GNU_TARGET_NAME)-gdb \
+		$(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-gdb
 
 gdbclient: $(TARGET_CROSS)gdb
 

Modified: trunk/buildroot/toolchain/uClibc/uclibc.mk
===================================================================
--- trunk/buildroot/toolchain/uClibc/uclibc.mk	2005-08-04 01:49:49 UTC (rev 11038)
+++ trunk/buildroot/toolchain/uClibc/uclibc.mk	2005-08-04 03:49:25 UTC (rev 11039)
@@ -126,6 +126,11 @@
 $(TARGET_DIR)/usr/bin/ldd:
 	$(MAKE1) -C $(UCLIBC_DIR) $(TARGET_CONFIGURE_OPTS) \
 		PREFIX=$(TARGET_DIR) utils install_utils
+ifeq ($(strip $(BR2_CROSS_TOOLCHAIN_TARGET_UTILS)),y)
+	mkdir -p $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/target_utils
+	install -c $(TARGET_DIR)/usr/bin/ldd \
+		$(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/target_utils/ldd
+endif
 	touch -c $(TARGET_DIR)/usr/bin/ldd
 
 UCLIBC_TARGETS=$(TARGET_DIR)/lib/libc.so.0