We agree.
Reviewed-by: Bruce Cherniak <bruce.chern...@intel.com>
> On Aug 8, 2018, at 6:50 AM, Juan A. Suarez Romero <jasua...@igalia.com> wrote:
>
> On Mon, 2018-08-06 at 11:52 +0200, Juan A. Suarez Romero wrote:
>> RADV now requires LLVM 6.0 or greater, and thus we can't build dist
>> tarball because swr requires LLVM 5.0.
>>
>> Let's bump required LLVM to 6.0 in swr too.
>>
>> Fixes: fd1121e839 ("amd: remove support for LLVM 5.0")
>> Cc: Tim Rowley <timothy.o.row...@intel.com>
>> Cc: Emil Velikov <emil.veli...@collabora.com>
>> Cc: Dylan Baker <dy...@pnwbakers.com>
>> Cc: Eric Engestrom <eric.engest...@intel.com>
>
> CC: "Cherniak, Bruce" <bruce.chern...@intel.com>
>
>> ---
>> configure.ac | 7 +++----
>> src/gallium/drivers/swr/Makefile.am | 2 +-
>> src/gallium/drivers/swr/SConscript | 4 ++--
>> 3 files changed, 6 insertions(+), 7 deletions(-)
>>
>> diff --git a/configure.ac b/configure.ac
>> index 7d898aeda9e..10d37584696 100644
>> --- a/configure.ac
>> +++ b/configure.ac
>> @@ -110,7 +110,7 @@ LLVM_REQUIRED_OPENCL=3.9.0
>> LLVM_REQUIRED_R600=3.9.0
>> LLVM_REQUIRED_RADEONSI=6.0.0
>> LLVM_REQUIRED_RADV=6.0.0
>> -LLVM_REQUIRED_SWR=5.0.0
>> +LLVM_REQUIRED_SWR=6.0.0
>>
>> dnl Check for progs
>> AC_PROG_CPP
>> @@ -2797,9 +2797,8 @@ if test -n "$with_gallium_drivers"; then
>> fi
>>
>> # XXX: Keep in sync with LLVM_REQUIRED_SWR
>> -AM_CONDITIONAL(SWR_INVALID_LLVM_VERSION, test "x$LLVM_VERSION" != x5.0.0 -a
>> \
>> - "x$LLVM_VERSION" != x5.0.1 -a
>> \
>> - "x$LLVM_VERSION" != x5.0.2)
>> +AM_CONDITIONAL(SWR_INVALID_LLVM_VERSION, test "x$LLVM_VERSION" != x6.0.0 -a
>> \
>> + "x$LLVM_VERSION" != x6.0.1)
>>
>> if test "x$enable_llvm" = "xyes" -a "$with_gallium_drivers"; then
>> llvm_require_version $LLVM_REQUIRED_GALLIUM "gallium"
>> diff --git a/src/gallium/drivers/swr/Makefile.am
>> b/src/gallium/drivers/swr/Makefile.am
>> index 5cc3f77478a..d20a6bdbed3 100644
>> --- a/src/gallium/drivers/swr/Makefile.am
>> +++ b/src/gallium/drivers/swr/Makefile.am
>> @@ -375,7 +375,7 @@ include $(top_srcdir)/install-gallium-links.mk
>> dist-hook:
>> if SWR_INVALID_LLVM_VERSION
>> @echo "*****************************************"
>> - @echo "LLVM 5.0.x required to create the tarball"
>> + @echo "LLVM 6.0.x required to create the tarball"
>> @echo "*****************************************"
>> @test
>> endif
>> diff --git a/src/gallium/drivers/swr/SConscript
>> b/src/gallium/drivers/swr/SConscript
>> index 224372eb3f5..a89d02c5db0 100644
>> --- a/src/gallium/drivers/swr/SConscript
>> +++ b/src/gallium/drivers/swr/SConscript
>> @@ -12,8 +12,8 @@ if not env['llvm']:
>> env['swr'] = False
>> Return()
>>
>> -if env['LLVM_VERSION'] < distutils.version.LooseVersion('5.0'):
>> - print("warning: swr requires LLVM >= 5.0: not building swr")
>> +if env['LLVM_VERSION'] < distutils.version.LooseVersion('6.0'):
>> + print("warning: swr requires LLVM >= 6.0: not building swr")
>> env['swr'] = False
>> Return()
>>
>
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
