toolchain: fix up GNU_TARGET_NAME link and target_utils location

The GNU_TARGET_NAME symlink and target_utils location were not correctly
adjusted to match the move of the toolchain to $(STAGING_DIR)/usr,
creating dangling symlinks.

diff --git a/package/strace/strace.mk b/package/strace/strace.mk
index 8e3b3b079132d1e957a8bd8d03670f41be247ab3..d27afaa3c1962822b69c025d9eaec6144db3f465 100644 (file)
--- a/package/strace/strace.mk
+++ b/package/strace/strace.mk
@@ -22,8 +22,8 @@ $(STRACE_HOOK_POST_INSTALL): $(STRACE_TARGET_INSTALL_TARGET)
        $(STRIPCMD) $(STRIP_STRIP_ALL) $(TARGET_DIR)/usr/bin/strace
        rm -f $(TARGET_DIR)/usr/bin/strace-graph
 ifeq ($(BR2_CROSS_TOOLCHAIN_TARGET_UTILS),y)
-       mkdir -p $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/target_utils
+       mkdir -p $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/target_utils
        install -c $(TARGET_DIR)/usr/bin/strace \
-               $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/target_utils/strace
+               $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/target_utils/strace
 endif
        touch $@

diff --git a/package/stunnel/stunnel.mk b/package/stunnel/stunnel.mk
index 779af0ef2dfaf2cd7e0f7bff7626fa27ec3f9339..1af0e6be3ff0f1299e5135901714a9eabc0702a3 100644 (file)
--- a/package/stunnel/stunnel.mk
+++ b/package/stunnel/stunnel.mk
@@ -57,9 +57,9 @@ $(TARGET_DIR)/usr/bin/stunnel: $(STUNNEL_DIR)/src/stunnel
        install -c $(STUNNEL_DIR)/src/stunnel $(TARGET_DIR)/usr/bin/stunnel
        $(STRIPCMD) $(TARGET_DIR)/usr/bin/stunnel > /dev/null 2>&1
 ifeq ($(BR2_CROSS_TOOLCHAIN_TARGET_UTILS),y)
-       mkdir -p $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/target_utils
+       mkdir -p $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/target_utils
        install -c $(TARGET_DIR)/usr/bin/stunnel \
-               $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/target_utils/stunnel
+               $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/target_utils/stunnel
 endif
 
 stunnel: uclibc $(TARGET_DIR)/usr/bin/stunnel

diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk
index d0d3ae31688119ec47fab9b052eb18423ce1f404..c4ef41a9dd987b7590b9fd065a660063f25fa4a5 100644 (file)
--- a/toolchain/gcc/gcc-uclibc-4.x.mk
+++ b/toolchain/gcc/gcc-uclibc-4.x.mk
@@ -319,14 +319,14 @@ endif
                ln -snf $(REAL_GNU_TARGET_NAME)-gcc \
                        $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-cc; \
        fi
-       if [ ! -e $(STAGING_DIR)/usr/bin/cc ]; then \
-               ln -snf gcc $(STAGING_DIR)/usr/bin/cc; \
+       if [ ! -e $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/bin/cc ]; then \
+               ln -snf gcc $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/bin/cc; \
        fi
        # Set up the symlinks to enable lying about target name.
        set -e; \
-       (cd $(STAGING_DIR); \
+       (cd $(STAGING_DIR)/usr; \
                ln -snf $(REAL_GNU_TARGET_NAME) $(GNU_TARGET_NAME); \
-               cd usr/bin; \
+               cd bin; \
                for app in $(REAL_GNU_TARGET_NAME)-*; do \
                        ln -snf $${app} \
                        $(GNU_TARGET_NAME)$${app##$(REAL_GNU_TARGET_NAME)}; \

diff --git a/toolchain/gdb/gdb.mk b/toolchain/gdb/gdb.mk
index 6e46c0bd1922a17180a80744b541ff6104492038..11a394117a25de3a202165d9d8457880782b166c 100644 (file)
--- a/toolchain/gdb/gdb.mk
+++ b/toolchain/gdb/gdb.mk
@@ -169,9 +169,9 @@ $(GDB_SERVER_DIR)/gdbserver: $(GDB_SERVER_DIR)/.configured
 
 $(TARGET_DIR)/usr/bin/gdbserver: $(GDB_SERVER_DIR)/gdbserver
 ifeq ($(BR2_CROSS_TOOLCHAIN_TARGET_UTILS),y)
-       mkdir -p $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/target_utils
+       mkdir -p $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/target_utils
        install -c $(GDB_SERVER_DIR)/gdbserver \
-               $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/target_utils/gdbserver
+               $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/target_utils/gdbserver
 endif
        install -c -D $(GDB_SERVER_DIR)/gdbserver $(TARGET_DIR)/usr/bin/gdbserver
 

diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
index b595b22d75d20228a25575652b58d71fd70fc85e..c8da46454cf319426c5a1d551d257653c0805338 100644 (file)
--- a/toolchain/uClibc/uclibc.mk
+++ b/toolchain/uClibc/uclibc.mk
@@ -548,9 +548,9 @@ $(TARGET_DIR)/usr/bin/ldd: $(cross_compiler)
                CPP=$(TARGET_CROSS)cpp LD=$(TARGET_CROSS)ld \
                PREFIX=$(TARGET_DIR) utils install_utils
 ifeq ($(BR2_CROSS_TOOLCHAIN_TARGET_UTILS),y)
-       mkdir -p $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/target_utils
+       mkdir -p $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/target_utils
        install -c $(TARGET_DIR)/usr/bin/ldd \
-               $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/target_utils/ldd
+               $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/target_utils/ldd
 endif
        touch -c $@