package/busybox: invert dependency with traceroute

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 45153731af5cdc341c91fe17730f13a543a288dc..36527ce24ee4772054889703e3e20271bace31a8 100644 (file)
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \
 
 # Packages that provide commands that may also be busybox applets:
 BUSYBOX_DEPENDENCIES = \
+       $(if $(BR2_PACKAGE_TRACEROUTE),traceroute) \
        $(if $(BR2_PACKAGE_UNZIP),unzip) \
        $(if $(BR2_PACKAGE_USBUTILS),usbutils) \
        $(if $(BR2_PACKAGE_UTIL_LINUX),util-linux) \

diff --git a/package/traceroute/traceroute.mk b/package/traceroute/traceroute.mk
index d01c62d5ead6d8e27e80422a3ad56573c9918c23..192197498df7d95fd68c8e608475dc16c0ff2bce 100644 (file)
--- a/package/traceroute/traceroute.mk
+++ b/package/traceroute/traceroute.mk
@@ -10,11 +10,6 @@ TRACEROUTE_SITE = http://downloads.sourceforge.net/traceroute/traceroute/tracero
 TRACEROUTE_LICENSE = GPL-2.0+, LGPL-2.1+
 TRACEROUTE_LICENSE_FILES = COPYING COPYING.LIB
 
-# Prefer full-featured traceroute over busybox's version
-ifeq ($(BR2_PACKAGE_BUSYBOX),y)
-TRACEROUTE_DEPENDENCIES += busybox
-endif
-
 define TRACEROUTE_BUILD_CMDS
        $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" -C $(@D)