Commit b71951b0 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

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: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 6aac003a

CHANGES

+3 −2
Original line number Diff line number Diff line
@@ -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

toolchain/binutils/binutils.mk

+7 −0
Original line number Diff line number Diff line
@@ -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: