[Mesa-dev] [PATCH] configure: Only check for OpenCL without LLVM when the latter is certain

[Tom Stellard]

On Tue, Jun 10, 2014 at 02:57:41PM +0100, Emil Velikov wrote:
> On 10/06/14 03:25, Michel Dänzer wrote:
> > From: Michel Dänzer <michel.daenzer at amd.com>
> > 
> > LLVM is enabled by default for some architectures, but the test was failing
> > before that.
> > 
> Thanks for fixing my silly mistake Michel. Would you mind CC-ing stable,
> similar to the offending commit (93257a56b5b: configure: error out when
> building opencl without LLVM) ?
> 
> Cc: "10.1 10.2" <mesa-stable at lists.freedesktop.org>
> Reviewed-by: Emil Velikov <emil.l.velikov at gmail.com>
> 

I've pushed this patch and cc'd stable.

-Tom

> 
> > Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>
> > ---
> >  configure.ac | 8 ++++----
> >  1 file changed, 4 insertions(+), 4 deletions(-)
> > 
> > diff --git a/configure.ac b/configure.ac
> > index 7b0009d..0eca945 100644
> > --- a/configure.ac
> > +++ b/configure.ac
> > @@ -1475,10 +1475,6 @@ if test "x$enable_opencl" = xyes; then
> >          AC_MSG_ERROR([cannot enable OpenCL without Gallium])
> >      fi
> >  
> > -    if test "x$enable_gallium_llvm" != xyes; then
> > -        AC_MSG_ERROR([cannot enable OpenCL without LLVM])
> > -    fi
> > -
> >      if test $GCC_VERSION_MAJOR -lt 4 -o $GCC_VERSION_MAJOR -eq 4 -a $GCC_VERSION_MINOR -lt 7; then
> >          AC_MSG_ERROR([gcc >= 4.7 is required to build clover])
> >      fi
> > @@ -1779,6 +1775,10 @@ if test "x$enable_gallium_llvm" = xyes; then
> >  else
> >      MESA_LLVM=0
> >      LLVM_VERSION_INT=0
> > +
> > +    if test "x$enable_opencl" = xyes; then
> > +        AC_MSG_ERROR([cannot enable OpenCL without LLVM])
> > +    fi
> >  fi
> >  
> >  dnl Directory for XVMC libs
> > 
> 
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev