summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Zern <jzern@google.com>2023-01-10 13:49:15 -0800
committerJames Zern <jzern@google.com>2023-01-10 13:49:15 -0800
commite067469e77bec79f7f52d074c440f01bfa4c14af (patch)
treed689be3e62f92b80f5f7cd17a37f1cdc1f83871c
parent708c4aa8540ec81aa5f0d93edc2e1e4d6d4581ac (diff)
downloadlibvpx-e067469e77bec79f7f52d074c440f01bfa4c14af.tar.gz
build: replace egrep with grep -E
avoids a warning on some platforms: egrep: warning: egrep is obsolescent; using grep -E Bug: webm:1786 Change-Id: Ia434297731303aacb0b02cf3dcbfd8e03936485d Fixed: webm:1786
-rwxr-xr-xbuild/make/gen_asm_deps.sh2
-rw-r--r--libs.mk4
-rwxr-xr-xtest/tools_common.sh4
3 files changed, 5 insertions, 5 deletions
diff --git a/build/make/gen_asm_deps.sh b/build/make/gen_asm_deps.sh
index 6a7bff9eb..3bd4d125f 100755
--- a/build/make/gen_asm_deps.sh
+++ b/build/make/gen_asm_deps.sh
@@ -42,7 +42,7 @@ done
[ -n "$srcfile" ] || show_help
sfx=${sfx:-asm}
-includes=$(LC_ALL=C egrep -i "include +\"?[a-z0-9_/]+\.${sfx}" $srcfile |
+includes=$(LC_ALL=C grep -E -i "include +\"?[a-z0-9_/]+\.${sfx}" $srcfile |
perl -p -e "s;.*?([a-z0-9_/]+.${sfx}).*;\1;")
#" restore editor state
for inc in ${includes}; do
diff --git a/libs.mk b/libs.mk
index f65e99242..fb6fbbeb2 100644
--- a/libs.mk
+++ b/libs.mk
@@ -446,13 +446,13 @@ ifeq ($(VPX_ARCH_X86)$(VPX_ARCH_X86_64),yes)
# YASM
$(BUILD_PFX)vpx_config.asm: $(BUILD_PFX)vpx_config.h
@echo " [CREATE] $@"
- @LC_ALL=C egrep "#define [A-Z0-9_]+ [01]" $< \
+ @LC_ALL=C grep -E "#define [A-Z0-9_]+ [01]" $< \
| awk '{print $$2 " equ " $$3}' > $@
else
ADS2GAS=$(if $(filter yes,$(CONFIG_GCC)),| $(ASM_CONVERSION))
$(BUILD_PFX)vpx_config.asm: $(BUILD_PFX)vpx_config.h
@echo " [CREATE] $@"
- @LC_ALL=C egrep "#define [A-Z0-9_]+ [01]" $< \
+ @LC_ALL=C grep -E "#define [A-Z0-9_]+ [01]" $< \
| awk '{print $$2 " EQU " $$3}' $(ADS2GAS) > $@
@echo " END" $(ADS2GAS) >> $@
CLEAN-OBJS += $(BUILD_PFX)vpx_config.asm
diff --git a/test/tools_common.sh b/test/tools_common.sh
index 844a12534..0e4a0a5c0 100755
--- a/test/tools_common.sh
+++ b/test/tools_common.sh
@@ -133,7 +133,7 @@ vpx_config_option_enabled() {
vpx_config_option="${1}"
vpx_config_file="${LIBVPX_CONFIG_PATH}/vpx_config.h"
config_line=$(grep "${vpx_config_option}" "${vpx_config_file}")
- if echo "${config_line}" | egrep -q '1$'; then
+ if echo "${config_line}" | grep -E -q '1$'; then
echo yes
fi
}
@@ -222,7 +222,7 @@ filter_strings() {
if [ -n "${filter}" ]; then
for s in ${strings}; do
- if echo "${s}" | egrep -q ${exclude} "${filter}" > /dev/null 2>&1; then
+ if echo "${s}" | grep -E -q ${exclude} "${filter}" > /dev/null 2>&1; then
filtered_strings="${filtered_strings} ${s}"
fi
done