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

[Tobias Droste]

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)

- R300 could also just call llvm_require_version $LLVM_REQUIRED_GALLIUM

> 
>      llvm_target_version_major=`echo $1 | cut -d. -f1 | egrep -o
> '^[[0-9]]+'` llvm_target_version_minor=`echo $1 | cut -d. -f2 | egrep -o
> '^[[0-9]]+'` @@ -1011,7 +1012,7 @@ radeon_llvm_check() {
>          amdgpu_llvm_target_name='amdgpu'
>      fi
> 
> -    llvm_check_version_for $*
> +    llvm_require_version $*
> 
>      llvm_add_target $amdgpu_llvm_target_name $2
> 
> @@ -2023,7 +2024,7 @@ if test "x$enable_opencl" = xyes; then
>         AC_MSG_ERROR([Clover requires libelf])
>      fi
> 
> -    llvm_check_version_for $LLVM_REQUIRED_OPENCL "opencl"
> +    llvm_require_version $LLVM_REQUIRED_OPENCL "opencl"
> 
>      llvm_add_default_components "opencl"
>      llvm_add_component "all-targets" "opencl"
> @@ -2334,8 +2335,7 @@ if test -n "$with_gallium_drivers"; then
>              fi
>              ;;
>          xswr)
> -            llvm_check_version_for $LLVM_REQUIRED_SWR "swr"
> -            require_llvm "swr"
> +            llvm_require_version $LLVM_REQUIRED_SWR "swr"
> 
>              swr_require_cxx_feature_flags "C++11" "__cplusplus >= 201103L"
> \ ",-std=c++11" \
> @@ -2377,7 +2377,7 @@ if test -n "$with_gallium_drivers"; then
>  fi
> 
>  if test "x$enable_gallium_llvm" == "xyes"; then
> -    llvm_check_version_for $LLVM_REQUIRED_GALLIUM "gallium"
> +    llvm_require_version $LLVM_REQUIRED_GALLIUM "gallium"
>      llvm_add_default_components "gallium"
>  fi