From 7df596a58cdfa763924487b8c275269de3497304 Mon Sep 17 00:00:00 2001 From: Sam James Date: Sun, 5 Jun 2022 12:09:02 -0700 Subject: grep: egrep -> grep -E, fgrep -> grep -F Newer versions of GNU grep (after grep 3.7, not inclusive) will warn on 'egrep' and 'fgrep' invocations. Convert usages within the tree to their expanded non-aliased counterparts to avoid irritating warnings during ./configure and the test suite. Signed-off-by: Sam James Reviewed-by: Fangrui Song --- elf/Makefile | 2 +- elf/tst-rtld-list-tunables.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'elf') diff --git a/elf/Makefile b/elf/Makefile index bfc9179fc5..2b646a91e0 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -1315,7 +1315,7 @@ $(objpfx)librtld.mk: $(objpfx)librtld.map Makefile while read lib file; do \ case $$lib in \ libc_pic.a) \ - LC_ALL=C fgrep -l /$$file \ + LC_ALL=C grep -F -l /$$file \ $(common-objpfx)stamp.os $(common-objpfx)*/stamp.os | \ LC_ALL=C \ sed 's@^$(common-objpfx)\([^/]*\)/stamp\.os$$@rtld-\1'" +=$$file@"\ diff --git a/elf/tst-rtld-list-tunables.sh b/elf/tst-rtld-list-tunables.sh index 70875bb5ab..52a3464c32 100755 --- a/elf/tst-rtld-list-tunables.sh +++ b/elf/tst-rtld-list-tunables.sh @@ -41,5 +41,5 @@ ${test_wrapper_env} \ ${run_program_env} \ $rtld --list-tunables \ | sort -u \ -| egrep "(rtld|malloc)" \ +| grep -E "(rtld|malloc)" \ | sed -e "s/0xf\+/0x[f]+/" -- cgit v1.2.3-70-g09d2