[Mesa-dev] [PATCH 2/3 v2] Android.common.mk: define HAVE_TIMESPEC_GET

[John Stultz]

On Thu, Jul 26, 2018 at 12:09 PM, Rob Herring <robh at kernel.org> wrote:
> Resending from correct email...
>
> On Thu, Jul 26, 2018 at 12:28 PM John Stultz <john.stultz at linaro.org> wrote:
>>
>> From: Sumit Semwal <sumit.semwal at linaro.org>
>>
>> This is a forward port of a patch from the AOSP/master tree:
>> https://android.googlesource.com/platform/external/mesa3d/+/bd30b663f55f8af73a0be4446349c5a2d4c641b0%5E%21/
>>
>> Since https://android-review.googlesource.com/c/718518 added
>> timespec_get() to bionic, mesa3d doesn't build due to redefinition
>> of timespec_get().
>>
>> Avoid redefinition by defining HAVE_TIMESPEC_GET flag.
>>
>> Test: build and boot tested db820c to UI.
>>
>> Cc: Rob Herring <rob.herring at linaro.org>
>> Cc: Alistair Strachan <astrachan at google.com>
>> Cc: Marissa Wall <marissaw at google.com>
>> Cc: Sumit Semwal <sumit.semwal at linaro.org>
>> Cc: Emil Velikov <emil.l.velikov at gmail.com>
>> Cc: Rob Clark <robdclark at gmail.com>
>> Reviewed-by: Emil Velikov <emil.velikov at collabora.com>
>> Signed-off-by: Sumit Semwal <sumit.semwal at linaro.org>
>> Signed-off-by: John Stultz <john.stultz at linaro.org>
>> ---
>> v2: Conditionalize it for PLATFORM_VERSION Q and higher
>> ---
>>  Android.common.mk | 6 ++++++
>>  1 file changed, 6 insertions(+)
>>
>> diff --git a/Android.common.mk b/Android.common.mk
>> index 397dc03..3585470 100644
>> --- a/Android.common.mk
>> +++ b/Android.common.mk
>> @@ -89,6 +89,12 @@ LOCAL_CPPFLAGS += \
>>  LOCAL_CONLYFLAGS += \
>>         -std=c99
>>
>> +# c11 timespec_get is part of bionic as well
>> +# https://android-review.googlesource.com/c/718518
>> +ifneq ($(shell [ "$(MESA_ANDROID_MAJOR_VERSION)" \< "Q" ]; echo $$?),0)
>
> While master is a letter most of the time, it's a number in release
> branches. I guess this happens to work with numbers too?, but can we
> follow the same style as other places.
>
> $(ifneq $(filter $(MESA_ANDROID_MAJOR_VERSION), 5 6 7 8),)
> ...
>
> Not sure if I have the list of versions quite right there, but you get the idea.

Sure. I'll give that a whirl.

thanks
-john