summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGustavo Zacarias <gustavo@zacarias.com.ar>2011-11-13 22:27:56 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2011-11-14 08:33:48 (GMT)
commit7dbf60b29dfe14b46f3a54afba609f73a22e370f (patch)
tree47f5774c1d7d873892335e8a7e019b3bb4a0106e
parent14520a6866e89d504947443bcf5633ffb34d3a92 (diff)
downloadbuildroot-7dbf60b29dfe14b46f3a54afba609f73a22e370f.tar.gz
buildroot-7dbf60b29dfe14b46f3a54afba609f73a22e370f.tar.bz2
grep: bump to version 2.9
Bump grep to version 2.9 Also make it build after busybox if it's enabled, we prefer full-blown utilities. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/grep/grep.mk7
1 files changed, 6 insertions, 1 deletions
diff --git a/package/grep/grep.mk b/package/grep/grep.mk
index e8b9cfe..e039135 100644
--- a/package/grep/grep.mk
+++ b/package/grep/grep.mk
@@ -4,7 +4,7 @@
#
#############################################################
-GREP_VERSION = 2.7
+GREP_VERSION = 2.9
GREP_SITE = $(BR2_GNU_MIRROR)/grep
GREP_CONF_OPT = --disable-perl-regexp --without-included-regex
GREP_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl)
@@ -15,4 +15,9 @@ GREP_CONF_ENV += LIBS=-liconv
GREP_DEPENDENCIES += libiconv
endif
+# Full grep preferred over busybox grep
+ifeq ($(BR2_PACKAGE_BUSYBOX),y)
+GREP_DEPENDENCIES += busybox
+endif
+
$(eval $(call AUTOTARGETS))