From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7856) id CB3FE384189A; Fri, 24 Jun 2022 12:35:37 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CB3FE384189A MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Xi Ruoyao To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r13-1242] libstdc++: use grep -E instead of egrep in scripts X-Act-Checkin: gcc X-Git-Author: Xi Ruoyao X-Git-Refname: refs/heads/master X-Git-Oldrev: 7fd34782b95bbe1b4dc9936b8923f86d4aaee379 X-Git-Newrev: fa4e97907fc979f550c3f02cde03d9c35f99df9b Message-Id: <20220624123537.CB3FE384189A@sourceware.org> Date: Fri, 24 Jun 2022 12:35:37 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Jun 2022 12:35:37 -0000 https://gcc.gnu.org/g:fa4e97907fc979f550c3f02cde03d9c35f99df9b commit r13-1242-gfa4e97907fc979f550c3f02cde03d9c35f99df9b Author: Xi Ruoyao Date: Fri Jun 24 15:02:23 2022 +0800 libstdc++: use grep -E instead of egrep in scripts egrep has been deprecated in favor of grep -E for a long time, and the next grep release (3.8 or 4.0) will print a warning of egrep is used. Stop using egrep so we won't see the warning. grep's from GNU, BSD (including Mac OS X), AIX, BusyBox all support -E and -F. Solaris grep doesn't support -E, but extract_symvers.in already contains a special case for Solaris and doxygen documentation generation is already broken on non-GNU. libstdc++-v3/ChangeLog: * scripts/extract_symvers.in: Use grep -E instead of egrep. * scripts/run_doxygen: Likewise. Diff: --- libstdc++-v3/scripts/extract_symvers.in | 4 ++-- libstdc++-v3/scripts/run_doxygen | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libstdc++-v3/scripts/extract_symvers.in b/libstdc++-v3/scripts/extract_symvers.in index dd9f63d4f16..d8ea62355ae 100755 --- a/libstdc++-v3/scripts/extract_symvers.in +++ b/libstdc++-v3/scripts/extract_symvers.in @@ -54,8 +54,8 @@ SunOS) ${readelf} ${lib} |\ sed -e 's/ \[: [A-Fa-f0-9]*\] //' -e '/\.dynsym/,/^$/p;d' |\ sed -e 's/ \[: [0-9]*\] //' |\ - egrep -v ' (LOCAL|UND) ' |\ - egrep -v ' (_DYNAMIC|_GLOBAL_OFFSET_TABLE_|_PROCEDURE_LINKAGE_TABLE_|_edata|_end|_etext)$' |\ + grep -E -v ' (LOCAL|UND) ' |\ + grep -E -v ' (_DYNAMIC|_GLOBAL_OFFSET_TABLE_|_PROCEDURE_LINKAGE_TABLE_|_edata|_end|_etext)$' |\ sed -e 's/ : / :_/g' |\ sed -e 's/ : / :_/g' |\ sed -e 's/ : / :_/g' |\ diff --git a/libstdc++-v3/scripts/run_doxygen b/libstdc++-v3/scripts/run_doxygen index 86da071d86c..50514c744c9 100644 --- a/libstdc++-v3/scripts/run_doxygen +++ b/libstdc++-v3/scripts/run_doxygen @@ -291,7 +291,7 @@ cxxflags="-Og -g -std=gnu++23" $gxx $cppflags $cxxflags ${srcdir}/doc/doxygen/stdheader.cc -o ./stdheader || exit 1 # Doxygen outputs something like "\fC#include \fP" and # we want that internal header to be replaced with something like . -problematic=`egrep -l '#include <.*h>' [a-z]*.3` +problematic=`grep -E -l '#include <.*h>' [a-z]*.3` for f in $problematic; do # this is also slow, but safe and easy to debug oldh=`sed -n '/fC#include .*/\1/p' $f` @@ -303,7 +303,7 @@ rm stdheader # Some of the pages for generated modules have text that confuses certain # implementations of man(1), e.g. on GNU/Linux. We need to have another # top-level *roff tag to /stop/ the .SH NAME entry. -problematic=`egrep --files-without-match '^\.SH SYNOPSIS' [A-Z]*.3` +problematic=`grep -E --files-without-match '^\.SH SYNOPSIS' [A-Z]*.3` #problematic='Containers.3 Sequences.3 Assoc_containers.3 Iterator_types.3' for f in $problematic; do