diff options
| author | Yann E. MORIN <yann.morin.1998@free.fr> | 2018-07-08 11:45:33 +0200 |
|---|---|---|
| committer | Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> | 2018-07-08 12:22:14 +0200 |
| commit | 0ed60ad5663ee544401d8dc5499c6b4468926aa9 (patch) | |
| tree | 186bd71fe8ea5dfc9458fd476c2f7f45cdb1c6c6 | |
| parent | faa21d4d22e1d8aac2313dcdc2f4bb9274ca59f5 (diff) | |
| download | buildroot-0ed60ad5663ee544401d8dc5499c6b4468926aa9.tar.gz buildroot-0ed60ad5663ee544401d8dc5499c6b4468926aa9.zip | |
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>
| -rw-r--r-- | package/busybox/busybox.mk | 1 | ||||
| -rw-r--r-- | package/traceroute/traceroute.mk | 5 |
2 files changed, 1 insertions, 5 deletions
diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 45153731af..36527ce24e 100644 --- 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 d01c62d5ea..192197498d 100644 --- 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) |
