OSDN Git Service

configure.ac: unbreak the build with non gnu grep
authorJonathan Gray <jsg@jsg.id.au>
Wed, 10 Sep 2014 06:11:25 +0000 (16:11 +1000)
committerTom Stellard <thomas.stellard@amd.com>
Wed, 10 Sep 2014 15:35:11 +0000 (08:35 -0700)
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@amd.com>
Signed-off-by: Jonathan Gray <jsg@jsg.id.au>
configure.ac

index 29cf32e..12f914e 100644 (file)
@@ -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"`