diff options
| author | jperkin <jperkin@pkgsrc.org> | 2022-11-16 12:12:46 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2022-11-16 12:12:46 +0000 |
| commit | 565dc2b61da6e477900d318da948662450125aad (patch) | |
| tree | 99969328aac8e1fa8815b6e8b2cb92c6826a8ba9 /mk/tools | |
| parent | 95013220d22d2611c9020427453f568ece1005ed (diff) | |
| download | pkgsrc-565dc2b61da6e477900d318da948662450125aad.tar.gz | |
mk: Avoid egrep/fgrep wrappers when using GNU grep.
A recent GNU grep release has started to add obnoxious warnings when calling
egrep/fgrep, so use grep with -E or -F flags respectively to avoid them.
Diffstat (limited to 'mk/tools')
| -rw-r--r-- | mk/tools/replace.mk | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk index 86ee26d1d5e..b213f3c6ed0 100644 --- a/mk/tools/replace.mk +++ b/mk/tools/replace.mk @@ -1,4 +1,4 @@ -# $NetBSD: replace.mk,v 1.295 2022/07/24 14:47:00 wiz Exp $ +# $NetBSD: replace.mk,v 1.296 2022/11/16 12:12:46 jperkin Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -998,10 +998,13 @@ MAKEFLAGS+= TOOLS_IGNORE.ggrep= TOOLS_DEPENDS.ggrep?= grep>=2.5.1:../../textproc/grep . for _t_ in ${_TOOLS.grep} TOOLS_CREATE+= g${_t_} -TOOLS_PATH.${_t_}= ${LOCALBASE}/bin/g${_t_} -TOOLS_PATH.g${_t_}= ${LOCALBASE}/bin/g${_t_} -TOOLS_ALIASES.g${_t_}= ${_t_} +TOOLS_PATH.${_t_}= ${LOCALBASE}/bin/ggrep +TOOLS_PATH.g${_t_}= ${LOCALBASE}/bin/ggrep . endfor +TOOLS_ARGS.egrep= -E +TOOLS_ARGS.gegrep= -E +TOOLS_ARGS.fgrep= -F +TOOLS_ARGS.gfgrep= -F . endif .else . for _t_ in ${_TOOLS.grep} |