[Mesa-dev] [PATCH] android: amd/common: add support for libmesa_amd_common

[Emil Velikov]

On 5 November 2016 at 12:21, Mauro Rossi <issor.oruam at gmail.com> wrote:
> Hi Nicolai,
>
> please review the attached patch which is necessary fix android build,
> as per https://bugs.freedesktop.org/show_bug.cgi?id=98573
>
> Tested with nougat-x86 build
> Kind regards
>
> Mauro
>
>
> From 36777861d42ec5ae0c0ed6a60835c76d13e38555 Mon Sep 17 00:00:00 2001
> From: Mauro Rossi <issor.oruam at gmail.com>
> Date: Sat, 5 Nov 2016 00:00:29 +0100
> Subject: [PATCH] android: amd/common: add support for libmesa_amd_common
>
> Fixes the following building error introduced with commit 7115e56
> and related amd/common dependencies:
>
> external/mesa/src/gallium/drivers/radeonsi/si_shader.c:6861: error:
> undefined reference to 'ac_is_sgpr_param'
> external/mesa/src/gallium/drivers/radeonsi/si_shader.c:6951: error:
> undefined reference to 'ac_is_sgpr_param'
> clang++: error: linker command failed with exit code 1 (use -v to see
> invocation)
>
> ninja: build stopped: subcommand failed.
> build/core/ninja.mk:148: recipe for target 'ninja_wrapper' failed
> make: *** [ninja_wrapper] Error 1
> ---
>  src/amd/Android.common.mk          | 47 ++++++++++++++++++++++++++++++++++++++
>  src/amd/Android.mk                 |  1 +
>  src/amd/Makefile.sources           | 11 +++++++++
We'd really want to do:

git rm src/amd/common/Makefile.sources
git mv src/amd/common/Makefile.am src/amd/Makefile.common.am
sed -i s|common/||g src/amd/Makefile.common.am
+ fix the odd piece throughout.

As-is we have the sources lists duplicated and makefiles async from
one another. And if history has thought us anything - this will break
all the everytime.

Mauro, can you give it a try ?

Thanks
Emil