[Mesa-stable] [Mesa-dev] [PATCH] configure.ac: detect LLVM patch level when built via cmake

[Emil Velikov]

On 09/09/14 19:56, Emil Velikov wrote:
> On 09/09/14 16:26, Tom Stellard wrote:
>> On Sat, Sep 06, 2014 at 01:43:55AM +1000, Jonathan Gray wrote:
>>> In LLVM 3.4.1 and 3.4.2 the patch level was only set in config.h when
>>> LLVM was built via autoconf and not when it was built with cmake.
>>> Fall back to retrieving the patch level from llvm-config --version to
>>> handle this case.
>>>
>>
>> We should extract LLVM_VERSION_PATH from $LLVM_VERSION and then we won't
>> have to worry about which config file it is in.
>>
> I believe you meant VERSION_PATCH above ? Indeed that would nice thing to have
> but I doubt that it will get back-ported to the llvm 3.4 branch.
> 
> Are there any plans on making a 3.4.3 release ? Would be nice to have it fixed
> at the root rather than adding the hack in mesa :)
> 
Tom can you please let us know if there are any plans for llvm 3.4.3 ?
Would prefer to avoid having this hack in mesa :)

Thanks
Emil

> -Emil
>> -Tom
>>
>>> Cc: "10.2 10.3" <mesa-stable at lists.freedesktop.org>
>>> Signed-off-by: Jonathan Gray <jsg at jsg.id.au>
>>> ---
>>>  configure.ac | 9 +++++++++
>>>  1 file changed, 9 insertions(+)
>>>
>>> diff --git a/configure.ac b/configure.ac
>>> index 99ae6ba..98cd938 100644
>>> --- a/configure.ac
>>> +++ b/configure.ac
>>> @@ -1705,6 +1705,15 @@ if test "x$enable_gallium_llvm" = xyes; then
>>>              [#include "${LLVM_INCLUDEDIR}/llvm/Config/config.h"],
>>>              LLVM_VERSION_PATCH=0) dnl Default if LLVM_VERSION_PATCH not found
>>>  
>>> +        dnl In LLVM 3.4.1 and 3.4.2 the patch level was only set in config.h
>>> +        dnl for autoconf builds and not cmake builds
>>> +        if test "$LLVM_VERSION_PATCH" -eq 0; then
>>> +            LLVM_VERSION_PATCH=`echo $LLVM_VERSION | cut -d. -f3`
>>> +            if test -z "$LLVM_VERSION_PATCH"; then
>>> +                LLVM_VERSION_PATCH=0
>>> +            fi
>>> +        fi
>>> +
>>>          if test -n "${LLVM_VERSION_MAJOR}"; then
>>>              LLVM_VERSION_INT="${LLVM_VERSION_MAJOR}0${LLVM_VERSION_MINOR}"
>>>          else
>>> -- 
>>> 1.9.3
>>>
>>> _______________________________________________
>>> mesa-dev mailing list
>>> mesa-dev at lists.freedesktop.org
>>> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
>> _______________________________________________
>> mesa-dev mailing list
>> mesa-dev at lists.freedesktop.org
>> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
>>
>