[Mesa-dev] [PATCH] android: radeon(s): fix libdrm_amdgpu shared dependencies

[Mauro Rossi]

2017-06-17 19:46 GMT+02:00 Emil Velikov <emil.l.velikov at gmail.com>:
> On 17 June 2017 at 18:01, Mauro Rossi <issor.oruam at gmail.com> wrote:
>> 2017-05-29 17:30 GMT+02:00 Emil Velikov <emil.l.velikov at gmail.com>:
>>> On 27 May 2017 at 10:59, Mauro Rossi <issor.oruam at gmail.com> wrote:
>>>>
>>>>
>>>> 2017-05-22 1:34 GMT+02:00 Mauro Rossi <issor.oruam at gmail.com>:
>>>>>
>>>>>
>>>>>
>>>>> 2017-05-21 18:27 GMT+02:00 Emil Velikov <emil.l.velikov at gmail.com>:
>>>>>>
>>>>>> Hi Mauro,
>>>>>>
>>>>>> There is a similar issue when building with autotools. There's a few
>>>>>> ways to address this so let's see what the devs prefer.
>>>>>>
>>>>>> Another temporary workaround is to build radeonsi alongside the other
>>>>>> radeon drivers.
>>>>>>
>>>>>> -Emil
>>>>>
>>>>>
>>>>> Just FYI, I am already building radeonsi (target libmesa_pipe_radeonsi)
>>>>> Mauro
>>>>
>>>>
>>>> ...continuing the sentence so building radeonsi (even if not working because
>>>> llvm 3.8 in nougat)
>>>> is not a workaround the r% drivers building errors.
>>>>
>>>> After  commit 44b29dd "amd/common: add missing libdrm include path",
>>>> is there an alternative proposed solution for android building errors that
>>>> compares with submitted patch?
>>>>
>>> The patch mentioned is incomplete/wrong. Can you try "rev 3" of the
>>> following series
>>> https://patchwork.freedesktop.org/series/24960/
>>>
>>> -Emil
>>
>> Hi,
>>
>> after rebase on top of 1f958c133 ("radeonsi: include ac_binary.h for
>> struct ac_shader_binary")
>> I still see residual building errors in amd/common
>>
>> Please review the following patch.
>> Thanks
>>
>> Mauro
>>
>
>
>> From 6339dc99dc23f491cb1cce09b55d4013f6d0da63 Mon Sep 17 00:00:00 2001
>> From: Mauro Rossi <issor.oruam at gmail.com>
>> Date: Sat, 20 May 2017 17:31:36 +0200
>> Subject: [PATCH] android: amd/common: fix libdrm_amdgpu shared
>>  dependency
>>
>> Fixes building errors in amd/common:
>>
>> target  C: libmesa_amd_common <= external/mesa/src/amd/common/ac_gpu_info.c
>> ...
>> target  C: libmesa_amd_common <= external/mesa/src/amd/common/ac_surface.c
>> ...
>>
>> external/mesa/src/amd/common/ac_gpu_info.h:31:10: fatal error:
>> 'amdgpu.h' file not found
>>          ^
>> 2 errors
>>
>> Fixes: 98a2492 ("ac_surface: use radeon_info from ac_gpu_info")
>> ---
>>  src/amd/Android.common.mk                | 3 +++
>>  6 files changed, 8 insertions(+), 5 deletions(-)
>>
>> diff --git a/src/amd/Android.common.mk b/src/amd/Android.common.mk
>> index e3915b45bf..39d2732fd9 100644
>> --- a/src/amd/Android.common.mk
>> +++ b/src/amd/Android.common.mk
>> @@ -61,6 +61,9 @@ LOCAL_C_INCLUDES := \
>>  LOCAL_EXPORT_C_INCLUDE_DIRS := \
>>      $(LOCAL_PATH)/common
>>
>> +LOCAL_SHARED_LIBRARIES := \
>> +    libdrm_amdgpu
>> +
> Looks spot on - pushed to master. Thanks Mauro!
>
> For the future please send patches via git send-email - the GMail MUI
> badly changes the contents.
> Any disposable comments can go after the --- line.
>
> -Emil

Ok,
BTW using "normal text mode" in sending (and "show original" in  received)
it is possible to avoid gmail issues.
Mauro