[Mesa-stable] [PATCH 1/3] android: broadcom/genxml: fix collision with intel/genxml header-gen macro

[Emil Velikov]

On 26 August 2018 at 23:22, Mauro Rossi <issor.oruam at gmail.com> wrote:
> Fixes the following building error, happening when building both intel and broadcom:
>
> Gen Header: libmesa_broadcom_genxml_32 <= v3d_packet_v21_pack.h
> FAILED: out/target/product/x86_64/gen/STATIC_LIBRARIES/libmesa_broadcom_genxml_intermediates/broadcom/cle/v3d_packet_v21_pack.h
> /bin/bash -c "python external/mesa/src/broadcom/cle/gen_pack_header.py \
> external/mesa/src/broadcom/cle/v3d_packet_v21.xml \
>> out/target/product/x86_64/gen/STATIC_LIBRARIES/libmesa_broadcom_genxml_intermediates/broadcom/cle/v3d_packet_v21_pack.h"
> Traceback (most recent call last):
>   File "external/mesa/src/broadcom/cle/gen_pack_header.py", line 626, in <module>
>     p = Parser(sys.argv[2])
> IndexError: list index out of range
>
> header-gen macro is already defined by Intel genxml building rules
> and the existing header-gen does not have the $(PRIVATE_VER) argument,
> infact the bash command line logged in the building error is missing
> exactly $(PRIVATE_VER) argument
>
> Renaming the macro as pack-header-gen in src/broadcom/Android.genxml.mk
> solves the building error, another possible way is to keep the gen rules
> commands expanded and not use the macros.
>
> Fixes: 7f80a9ff13 ("vc4: Introduce XML-based packet header generation like Intel's.")
> Cc: "18.2" <mesa-stable at lists.freedesktop.org>
> Signed-off-by: Mauro Rossi <issor.oruam at gmail.com>

Reviewed-by: Emil Velikov <emil.velikov at collabora.com>

-Emil