public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc(refs/users/xry111/heads/no-egrep-v2)] fortran: use grep instead of fgrep
@ 2022-06-25  4:48 Xi Ruoyao
  0 siblings, 0 replies; only message in thread
From: Xi Ruoyao @ 2022-06-25  4:48 UTC (permalink / raw)
  To: gcc-cvs

https://gcc.gnu.org/g:a212eb6be3ef46fc591967f0d1bf2af73f349ebe

commit a212eb6be3ef46fc591967f0d1bf2af73f349ebe
Author: Xi Ruoyao <xry111@xry111.site>
Date:   Fri Jun 24 20:23:13 2022 +0800

    fortran: use grep instead of fgrep
    
    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.
    Stop using fgrep so we won't see the warning.
    
    We can't hard code grep -F here or it may break build on hosts w/o GNU
    grep.  autoconf documentation contains a warning about this issue and
    suggest to use AC_PROG_FGREP and $FGREP, but these are too overkill in
    the specific case: there is no way "debian" could be interpreted as an
    non-trivial regex, so we can use a plain grep here.
    
    gcc/fortran/ChangeLog:
    
            * Make-lang.in: Use grep instead of fgrep.

Diff:
---
 gcc/fortran/Make-lang.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gcc/fortran/Make-lang.in b/gcc/fortran/Make-lang.in
index 1cb47cb1a52..6eb597d0ca0 100644
--- a/gcc/fortran/Make-lang.in
+++ b/gcc/fortran/Make-lang.in
@@ -278,7 +278,7 @@ $(DESTDIR)$(man1dir)/$(GFORTRAN_INSTALL_NAME)$(man1ext): doc/gfortran.1 \
 	-chmod a-x $@
 
 fortran.uninstall:
-	if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
+	if $(SHELL) -c 'install-info --version | sed 1q | grep -s -v -i debian' >/dev/null 2>&1; then \
 	  echo " install-info --delete --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/gfortran.info"; \
 	  install-info --delete --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/gfortran.info || : ; \
 	else : ; fi; \


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2022-06-25  4:48 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-25  4:48 [gcc(refs/users/xry111/heads/no-egrep-v2)] fortran: use grep instead of fgrep Xi Ruoyao

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).