[Mesa-dev] [PATCH v2] Android: add libmesa_nir dependency to libmesa_dricore

[Kenneth Graunke]

On Monday, October 16, 2017 12:07:47 PM PDT Rob Herring wrote:
> Commit 32fcced7b479 ("meta: Unset the textures_used_by_txf bitfield.")
> added a dependency in libmesa_dricore to NIR headers, but failed to add
> libmesa_nir as a dependency resulting in a build error:
> 
> In file included from external/mesa3d/src/mesa/drivers/common/meta.c:90:
> external/mesa3d/src/compiler/nir/nir.h:48:10: fatal error: 'nir_opcodes.h' file not found
> 
> Add libmesa_nir as a static library dependency to libmesa_dricore.
> 
> Fixes: 32fcced7b479 ("meta: Unset the textures_used_by_txf bitfield.")
> Cc: Kenneth Graunke <kenneth at whitecape.org>
> Signed-off-by: Rob Herring <robh at kernel.org>
> ---
> v2:
> - Use LOCAL_STATIC_LIBRARIES as otherwise we get duplicate symbols.
> 
>  src/mesa/Android.libmesa_dricore.mk | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/src/mesa/Android.libmesa_dricore.mk b/src/mesa/Android.libmesa_dricore.mk
> index c7715a50c90e..34fd8581c2df 100644
> --- a/src/mesa/Android.libmesa_dricore.mk
> +++ b/src/mesa/Android.libmesa_dricore.mk
> @@ -64,6 +64,9 @@ LOCAL_C_INCLUDES := \
>  LOCAL_GENERATED_SOURCES += \
>  	$(MESA_GEN_GLSL_H)
>  
> +LOCAL_STATIC_LIBRARIES += \
> +	libmesa_nir
> +
>  LOCAL_WHOLE_STATIC_LIBRARIES += \
>  	libmesa_program \
>  	libmesa_git_sha1

Thanks Rob.  It's strange that the autotools build and Android builds
apparently link this code differently... :(

Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: This is a digitally signed message part.
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20171016/a5493911/attachment.sig>