[Mesa-dev] [PATCH v2 1/1] clover: Require libelf

[Emil Velikov]

On 21/10/14 16:59, Jan Vesely wrote:
> v2: test for libelf once, check in both radeon and clover
> 
> CC: Tom Stellard <tom at stellard.net>
> CC: Emil Velikov <emil.l.velikov at gmail.com>
> CC: Francisco Jerez <currojerez at riseup.net>
> Signed-off-by: Jan Vesely <jan.vesely at rutgers.edu>
Reviewed-by: Emil Velikov <emil.l.velikov at gmail.com>

Afaics you don't have commit access to the repo, so I'll be pushing this
patch within a few hours.

Thanks
Emil

> ---
>  configure.ac | 10 ++++++++--
>  1 file changed, 8 insertions(+), 2 deletions(-)
> 
> diff --git a/configure.ac b/configure.ac
> index 0ed9325..93b25a2 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -1465,6 +1465,7 @@ AC_ARG_WITH([clang-libdir],
>     [CLANG_LIBDIR=''])
>  
>  PKG_CHECK_EXISTS([libclc], [have_libclc=yes], [have_libclc=no])
> +AC_CHECK_LIB([elf], [elf_memory], [have_libelf=yes;ELF_LIB=-lelf])
>  
>  if test "x$enable_opencl" = xyes; then
>      if test -z "$with_gallium_drivers"; then
> @@ -1495,6 +1496,10 @@ if test "x$enable_opencl" = xyes; then
>      else
>          OPENCL_LIBNAME="OpenCL"
>      fi
> +
> +    if test "x$have_libelf" != xyes; then
> +       AC_MSG_ERROR([Clover requires libelf])
> +    fi
>  fi
>  AM_CONDITIONAL(HAVE_CLOVER, test "x$enable_opencl" = xyes)
>  AM_CONDITIONAL(HAVE_CLOVER_ICD, test "x$enable_opencl_icd" = xyes)
> @@ -1870,8 +1875,9 @@ radeon_llvm_check() {
>      fi
>      LLVM_COMPONENTS="${LLVM_COMPONENTS} r600 bitreader ipo"
>      NEED_RADEON_LLVM=yes
> -    AC_CHECK_LIB([elf], [elf_memory], [ELF_LIB=-lelf],
> -                                 [AC_MSG_ERROR([$1 requires libelf when using LLVM])])
> +    if test "x$have_libelf" != xyes; then
> +       AC_MSG_ERROR([$1 requires libelf when using llvm])
> +    fi
>  }
>  
>  dnl Duplicates in GALLIUM_DRIVERS_DIRS are removed by sorting it after this block
>