[Mesa-dev] [PATCH 05/17] configure.ac: Mandate --enable-gallium-llvm when checking LLVM version

[Tobias Droste]

Am Mittwoch, 8. Februar 2017, 10:39:56 CET schrieb Emil Velikov:
> On 8 February 2017 at 01:03, Tobias Droste <tdroste at gmx.de> wrote:
> > Small comment below. Either way:
> > 
> > Reviewed-by: Tobias Droste <tdroste at gmx.de>
> > 
> > Am Dienstag, 7. Februar 2017, 22:44:47 CET schrieb Emil Velikov:
> >> From: Emil Velikov <emil.velikov at collabora.com>
> >> 
> >> With this change we effectively require --enable-gallium-llvm when
> >> building RADV. This should be perfectly safe since the gallium radeonsi
> >> driver already explicitly requires it.
> >> 
> >> The "gallium" part in --enable-gallium-llvm is about to be removed soon
> >> (not in stable) but until then make sure that things can build.
> >> 
> >> To reflect the requirement (as opposed to check previously) rename
> >> llvm_check_version_for to llvm_require_version
> >> 
> >> Cc: Dave Airlie <airlied at redhat.com>
> >> CC: Tobias Droste <tdroste at gmx.de>
> >> Cc: "17.0" <mesa-stable at lists.freedesktop.org>
> >> Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
> >> ---
> >> 
> >>  configure.ac | 12 ++++++------
> >>  1 file changed, 6 insertions(+), 6 deletions(-)
> >> 
> >> diff --git a/configure.ac b/configure.ac
> >> index 525c8d2a91..4098da7666 100644
> >> --- a/configure.ac
> >> +++ b/configure.ac
> >> @@ -966,11 +966,12 @@ require_llvm() {
> >> 
> >>      fi
> >>  
> >>  }
> >> 
> >> -llvm_check_version_for() {
> >> +llvm_require_version() {
> >> 
> >>      if test "x$MESA_LLVM" = x0; then
> >>      
> >>          AC_MSG_ERROR([LLVM $1 or newer is required for $2])
> >>          return
> >>      
> >>      fi
> >> 
> >> +    require_llvm $2
> > 
> > Maybe just 'inline' the function here?
> > 
> > There are two callers left:
> > 
> > - SWR doesn't actually need it anymore, because it calls
> > llvm_require_version (which now calls require_llvm)
> 
> That's already tackled in separate patch. Can squash if you/others prefer.

Now that you say this. it is already in this patch. So everything is good ;-)

> 
> > - R300 could also just call llvm_require_version $LLVM_REQUIRED_GALLIUM
> 
> There is a 'generic' gallium check which does that so by following
> your suggestion we'll effectively do it twice.
> 
> I'm leaning towards keeping it separate such that we can use it from
> anywhere.

Ok.

> 
> Thanks
> Emil