diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2011-12-01 09:56:54 +0100 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2011-12-01 09:56:54 +0100 |
| commit | c3b72c6cd7b82e70cf61f4eac59f176444eaebf1 (patch) | |
| tree | fe27a5f40b77b826a0bbe7bc2587e4592f74e6c5 /package/grep | |
| parent | c29253ef2e2a473e597637b7ada9fb268dfa8767 (diff) | |
| parent | e3c6b3853ef054efe3ab9800392aec7aa7656dd3 (diff) | |
| download | buildroot-novena-c3b72c6cd7b82e70cf61f4eac59f176444eaebf1.tar.gz buildroot-novena-c3b72c6cd7b82e70cf61f4eac59f176444eaebf1.zip | |
Merge branch 'next'
And kickoff 2012.02 cycle.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/grep')
| -rw-r--r-- | package/grep/grep.mk | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/package/grep/grep.mk b/package/grep/grep.mk index e8b9cfef2..e039135b3 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)) |