diff mbox series

[5/8] intl: stop using fgrep for exgettext

Message ID	8532a93336a900754cc78c4c0834bf1cc3b7173a.camel@xry111.site
State	Committed
Commit	476ef855d08db02a027150ea92611c1626ea7350
Headers	DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org F0D293850209 sender: xry111@xry111.site) by xry111.site (Postfix) with ESMTPSA id 9FAFC66926 for <gcc-patches@gcc.gnu.org>; Fri, 24 Jun 2022 03:05:38 -0400 (EDT) Message-ID: <8532a93336a900754cc78c4c0834bf1cc3b7173a.camel@xry111.site> Subject: [PATCH 5/8] intl: stop using fgrep for exgettext To: gcc-patches@gcc.gnu.org Date: Fri, 24 Jun 2022 15:05:36 +0800 In-Reply-To: <74ea0c62ebe19db186263053e4051f81d46e9da4.camel@xry111.site> References: <74ea0c62ebe19db186263053e4051f81d46e9da4.camel@xry111.site> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.44.2 MIME-Version: 1.0 Precedence: list From: Xi Ruoyao via Gcc-patches <gcc-patches@gcc.gnu.org> Reply-To: Xi Ruoyao <xry111@xry111.site> Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" <gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org>
Series	Stop using obsoleted egrep/fgrep \| [0/8] Stop using obsoleted egrep/fgrep [1/8] config: use grep -E instead of egrep [2/8] fixincludes: use grep -E/-F instead of egrep/fgrep [3/8] libstdc++: use grep -E instead of egrep in scripts [4/8] libbacktrace: use grep -F instead of fgrep [5/8] intl: stop using fgrep for exgettext [6/8] fortran: use grep -F instead of fgrep [7/8] testsuite: use grep -E instead of egrep [8/8] contrib: use grep -E instead of egrep

Commit Message

Xi Ruoyao June 24, 2022, 7:05 a.m. UTC

  fgrep has been deprecated in favor of grep -F for a long time, and the
next grep release (3.8 or 4.0) will print a warning of fgrep is used.
And, the fgrep command in exgettext is no longer useful after we
migrated from SVN to Git.  Remove the fgrep command so we won't see the
warning.

gcc/ChangeLog:

	* po/exgettext: Remove unneeded fgrep command.
---
 gcc/po/exgettext | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Joseph Myers June 24, 2022, 4:06 p.m. UTC | #1

On Fri, 24 Jun 2022, Xi Ruoyao via Gcc-patches wrote:

> fgrep has been deprecated in favor of grep -F for a long time, and the
> next grep release (3.8 or 4.0) will print a warning of fgrep is used.
> And, the fgrep command in exgettext is no longer useful after we
> migrated from SVN to Git.  Remove the fgrep command so we won't see the
> warning.
> 
> gcc/ChangeLog:
> 
> 	* po/exgettext: Remove unneeded fgrep command.

OK.

Xi Ruoyao June 25, 2022, 4 a.m. UTC | #2

On Fri, 2022-06-24 at 16:06 +0000, Joseph Myers wrote:
> On Fri, 24 Jun 2022, Xi Ruoyao via Gcc-patches wrote:
> 
> > fgrep has been deprecated in favor of grep -F for a long time, and
> > the
> > next grep release (3.8 or 4.0) will print a warning of fgrep is
> > used.
> > And, the fgrep command in exgettext is no longer useful after we
> > migrated from SVN to Git.  Remove the fgrep command so we won't see
> > the
> > warning.
> > 
> > gcc/ChangeLog:
> > 
> >         * po/exgettext: Remove unneeded fgrep command.
> 
> OK.

Pushed as r13-1264 with ChangeLog fix (gcc/po/ChangeLog should be used),
as it does not depend on other parts in the series.

diff mbox series

Patch

diff --git a/gcc/po/exgettext b/gcc/po/exgettext
index 95cb0e75554..43b2e81bd24 100644
--- a/gcc/po/exgettext
+++ b/gcc/po/exgettext
@@ -99,7 +99,7 @@  echo "scanning for keywords, %e and %n strings..." >&2
   lang_subdirs=`echo */config-lang.in */*/config-lang.in | sed -e 's|/config-lang\.in||g'`
   { for dir in "" c-family/ common/ common/config/ common/config/*/ \
       config/ config/*/ \
-      `find $lang_subdirs -type d -print | fgrep -v .svn | sort | sed -e 's|$|/|'`
+      `find $lang_subdirs -type d -print | sort | sed -e 's|$|/|'`
     do  for glob in '*.c' '*.cc' '*.h' '*.def'
         do  eval echo $dir$glob
         done