[Mesa-stable] [Mesa-dev] [PATCH 5/7] configure.ac: add llvm_add_optional_component helper

[Emil Velikov]

On 5 October 2017 at 12:02, Eric Engestrom <eric.engestrom at imgtec.com> wrote:
> On Thursday, 2017-10-05 10:19:07 +0000, Emil Velikov wrote:
>> From: Emil Velikov <emil.velikov at collabora.com>
>>
>> We want to add "optional" components, which have been added with later
>> LLVM versions.
>>
>> One such in-tree example is inteljitevents. Others are to follow
>> shortly.
>>
>> Cc: mesa-stable at lists.freedesktop.org
>> Cc: Tobias Droste <tdroste at gmx.de>
>> Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
>> ---
>> Tobias, any preference if we keep this separate helperor fold it with
>> llvm_add_component?
>>
>> Should we fold the llvm_add_default_components usecase here, or keep it
>> separate patch.
>> ---
>>  configure.ac | 12 +++++++++---
>>  1 file changed, 9 insertions(+), 3 deletions(-)
>>
>> diff --git a/configure.ac b/configure.ac
>> index dbaa6569e4e..56cbf26c778 100644
>> --- a/configure.ac
>> +++ b/configure.ac
>> @@ -955,6 +955,14 @@ llvm_add_component() {
>>      fi
>>  }
>>
>> +llvm_add_optional_component() {
>> +    new_llvm_component=$1
>> +    driver_name=$2
>> +
>> +    if $LLVM_CONFIG --components | grep -iqw $new_llvm_component ; then
>> +        LLVM_COMPONENTS="${LLVM_COMPONENTS} ${new_llvm_component}"
>> +    fi
>> +}
>>  llvm_add_default_components() {
>>      driver_name=$1
>>
>> @@ -965,9 +973,7 @@ llvm_add_default_components() {
>>      llvm_add_component "mcjit" $driver_name
>>
>>      # Optional default components
>> -    if $LLVM_CONFIG --components | grep -iqw inteljitevents ; then
>> -        LLVM_COMPONENTS="$LLVM_COMPONENTS inteljitevents"
>> -    fi
>> +    llvm_add_component "inteljitevents" $driver_name
>
> You meant `llvm_add_optional_component`, right?
>
Right, will update (or split if people prefer) for v2.

-Emil