diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2009-11-22 21:25:31 +0100 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2009-11-22 21:25:31 +0100 |
| commit | b71951b0e736945937ab7a7878547f1add8d62ac (patch) | |
| tree | 56979d2982ff6701c1ee1a57f48181099175be9f | |
| parent | 6aac003abf821e220f7d3c6c597c1f0f1dd84a06 (diff) | |
toolchain/binutils: make sure target-binutils runs after busybox
Closes #597
Ensure that binutils-target runs after busybox if enabled, so it can
overwrite the busybox symlink for ar if that applet is enabled.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
| -rw-r--r-- | CHANGES | 5 | ||||
| -rw-r--r-- | toolchain/binutils/binutils.mk | 7 |
2 files changed, 10 insertions, 2 deletions
@@ -18,8 +18,8 @@ ncftp, ncurses, netkittelnet, netsnmp, ntfs-3g, openntp, openssl, php, python, quagga, radvd, rsync, samba, sawman, sdl, shared-mime-info, spawn-fcgi, speech-tools, sqlite, squashfs, synergy, syslinux, - tcpdump, u-boot, util-linux, valgrind, vsftpd, wipe, wpa-supplicant, - xdata_xcursor-themes, zlib + target-binutils, tcpdump, u-boot, util-linux, valgrind, vsftpd, wipe, + wpa-supplicant, xdata_xcursor-themes, zlib Removed package: mdnsresponder, mpatrol, gcc 3.4.6 + 4.0.4 @@ -34,6 +34,7 @@ #565: libevent: Bump version and clean up makefile #587: Use iptables multipurpose binaries and bump to 1.4.4 #593: Missing early check for patch(1) + #597: (REOP) Selecting busybox in buildroot's config clobbers ar ... #609: libmicrohttpd: New package #615: python: Don't delete .py files unless asked #617: netkit/inetd requires RPC and fails to build if RPC is disabled diff --git a/toolchain/binutils/binutils.mk b/toolchain/binutils/binutils.mk index f3509e710..04122b385 100644 --- a/toolchain/binutils/binutils.mk +++ b/toolchain/binutils/binutils.mk @@ -175,6 +175,13 @@ endif -$(STRIPCMD) $(TARGET_DIR)/usr/$(REAL_GNU_TARGET_NAME)/bin/* > /dev/null 2>&1 -$(STRIPCMD) $(TARGET_DIR)/usr/bin/* > /dev/null 2>&1 +# If both binutils-target and busybox are selected, make certain binutils +# gets to run after busybox, so it can overwrite the busybox symlink for +# ar if enabled +ifeq ($(BR2_PACKAGE_BUSYBOX),y) +BINUTILS_TARGET_PREREQ += busybox +endif + binutils_target: $(BINUTILS_TARGET_PREREQ) $(TARGET_DIR)/usr/bin/ld binutils_target-clean: |