summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYann E. MORIN <yann.morin.1998@free.fr>2018-07-08 11:46:01 +0200
committerArnout Vandecappelle (Essensium/Mind) <arnout@mind.be>2018-07-08 13:08:05 +0200
commit3fa18f1a440ac484ef8ab84f1cf2417e2f6f02ba (patch)
tree24174575556de0204f2b7ebaf913afaf670058df
parentc2cf255b6759bd6d286526a5027dd49334bf8965 (diff)
downloadbuildroot-3fa18f1a440ac484ef8ab84f1cf2417e2f6f02ba.tar.gz
buildroot-3fa18f1a440ac484ef8ab84f1cf2417e2f6f02ba.zip
package/busybox: invert dependency with grep
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.mk1
-rw-r--r--package/grep/grep.mk5
2 files changed, 1 insertions, 5 deletions
diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index b00341c576..f614576de7 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_GREP),grep) \
$(if $(BR2_PACKAGE_GZIP),gzip) \
$(if $(BR2_PACKAGE_I2C_TOOLS),i2c-tools) \
$(if $(BR2_PACKAGE_IFENSLAVE),ifenslave) \
diff --git a/package/grep/grep.mk b/package/grep/grep.mk
index 6e44a189f0..730f36a344 100644
--- a/package/grep/grep.mk
+++ b/package/grep/grep.mk
@@ -25,9 +25,4 @@ else
GREP_CONF_OPTS += --disable-perl-regexp
endif
-# Full grep preferred over busybox grep
-ifeq ($(BR2_PACKAGE_BUSYBOX),y)
-GREP_DEPENDENCIES += busybox
-endif
-
$(eval $(autotools-package))
OpenPOWER on IntegriCloud