Mesa (refs/keep-around/dfb1f2759c668ad0e2147ca0b29aed6fb2473451): configure: use compliant grep regex checks
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Mon Jul 9 17:28:36 UTC 2018
Module: Mesa
Branch: refs/keep-around/dfb1f2759c668ad0e2147ca0b29aed6fb2473451
Commit: dfb1f2759c668ad0e2147ca0b29aed6fb2473451
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=dfb1f2759c668ad0e2147ca0b29aed6fb2473451
Author: Emil Velikov <emil.velikov at collabora.com>
Date: Thu Jun 14 14:15:59 2018 +0100
configure: use compliant grep regex checks
The current `grep "foo\|bar"' trips on some grep implementations, like
the FreeBSD one. Instead use `egrep "foo|bar"' as suggested by Stefan.
Cc: Stefan Esser <se at FreeBSD.org>
Reported-by: Stefan Esser <se at FreeBSD.org>
Bugzilla: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=228673
Fixes: 1914c814a6c ("configure: error out if building OMX w/o supported platform")
Fixes: 63e11ac2b5c ("configure: error out if building VA w/o supported platform")
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
Reviewed-by: Matt Turner <mattst88 at gmail.com>
---
configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index a195362007..502b1787c6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2248,13 +2248,13 @@ else
have_vdpau_platform=no
fi
-if echo $platforms | grep -q "x11\|drm"; then
+if echo $platforms | egrep -q "x11|drm"; then
have_omx_platform=yes
else
have_omx_platform=no
fi
-if echo $platforms | grep -q "x11\|drm\|wayland"; then
+if echo $platforms | egrep -q "x11|drm|wayland"; then
have_va_platform=yes
else
have_va_platform=no
More information about the mesa-commit
mailing list