Mesa (master): configure.ac: unbreak the build with non gnu grep

Tom Stellard tstellar at kemper.freedesktop.org
Wed Sep 10 15:40:06 UTC 2014


Module: Mesa
Branch: master
Commit: cdb353539c259d5c5137394f6a7b4dafef9a40da
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=cdb353539c259d5c5137394f6a7b4dafef9a40da

Author: Jonathan Gray <jsg at jsg.id.au>
Date:   Wed Sep 10 16:11:25 2014 +1000

configure.ac: unbreak the build with non gnu grep

181581280bd430d122d416e308c1de82db82da04 changed the way the
llvm-config version is read from sed to grep and introduced
a requirement for gnu grep extension that treats BREs as EREs.

Avoid this by calling egrep instead of grep which should be
able to handle EREs everywhere.

This allows Mesa to build on OpenBSD again.

Reviewed-by: Tom Stellard <thomas.stellard at amd.com>
Signed-off-by: Jonathan Gray <jsg at jsg.id.au>

---

 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 29cf32e..12f914e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1695,7 +1695,7 @@ if test "x$enable_gallium_llvm" = xyes; then
     fi
 
     if test "x$LLVM_CONFIG" != xno; then
-        LLVM_VERSION=`$LLVM_CONFIG --version | grep -o '^[[0-9.]]\+'`
+        LLVM_VERSION=`$LLVM_CONFIG --version | egrep -o '^[[0-9.]]+'`
         LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags`
         LLVM_BINDIR=`$LLVM_CONFIG --bindir`
         LLVM_CPPFLAGS=`strip_unwanted_llvm_flags "$LLVM_CONFIG --cppflags"`




More information about the mesa-commit mailing list