summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2009-01-30 13:34:42 +0000
committerPeter Korsgaard <jacmet@sunsite.dk>2009-01-30 13:34:42 +0000
commit92bd25c9eb14eafb1beb8f41af71fef1e545922a (patch)
tree6574d5baaa0bcf3d9c02287c75d020932674e5bd
parent81ddf3d083e6f238de66bc9c504c814de56d9545 (diff)
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.
-rw-r--r--package/strace/strace.mk4
-rw-r--r--package/stunnel/stunnel.mk4
-rw-r--r--toolchain/gcc/gcc-uclibc-4.x.mk8
-rw-r--r--toolchain/gdb/gdb.mk4
-rw-r--r--toolchain/uClibc/uclibc.mk4
5 files changed, 12 insertions, 12 deletions
diff --git a/package/strace/strace.mk b/package/strace/strace.mk
index 8e3b3b079..d27afaa3c 100644
--- 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 779af0ef2..1af0e6be3 100644
--- 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 d0d3ae316..c4ef41a9d 100644
--- 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 6e46c0bd1..11a394117 100644
--- 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 b595b22d7..c8da46454 100644
--- 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 $@