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

[Dylan Baker]

Quoting Mauro Rossi (2018-08-26 15:22:13)
> 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>
> ---
>  src/broadcom/Android.genxml.mk | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/src/broadcom/Android.genxml.mk b/src/broadcom/Android.genxml.mk
> index eb5d142fe0..91e0de05d9 100644
> --- a/src/broadcom/Android.genxml.mk
> +++ b/src/broadcom/Android.genxml.mk
> @@ -39,7 +39,7 @@ $(intermediates)/dummy.c:
>  # This is the list of auto-generated files headers
>  LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/broadcom/, $(BROADCOM_GENXML_GENERATED_FILES))
>  
> -define header-gen
> +define pack-header-gen
>         @mkdir -p $(dir $@)
>         @echo "Gen Header: $(PRIVATE_MODULE) <= $(notdir $(@))"
>         $(hide) $(PRIVATE_SCRIPT) $(PRIVATE_SCRIPT_FLAGS) $(PRIVATE_XML) $(PRIVATE_VER) > $@
> @@ -49,25 +49,25 @@ $(intermediates)/broadcom/cle/v3d_packet_v21_pack.h: PRIVATE_SCRIPT := $(MESA_PY
>  $(intermediates)/broadcom/cle/v3d_packet_v21_pack.h: PRIVATE_XML := $(LOCAL_PATH)/cle/v3d_packet_v21.xml
>  $(intermediates)/broadcom/cle/v3d_packet_v21_pack.h: PRIVATE_VER := 21
>  $(intermediates)/broadcom/cle/v3d_packet_v21_pack.h: $(LOCAL_PATH)/cle/v3d_packet_v21.xml $(LOCAL_PATH)/cle/gen_pack_header.py
> -       $(call header-gen)
> +       $(call pack-header-gen)
>  
>  $(intermediates)/broadcom/cle/v3d_packet_v33_pack.h: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/cle/gen_pack_header.py
>  $(intermediates)/broadcom/cle/v3d_packet_v33_pack.h: PRIVATE_XML := $(LOCAL_PATH)/cle/v3d_packet_v33.xml
>  $(intermediates)/broadcom/cle/v3d_packet_v33_pack.h: PRIVATE_VER := 33
>  $(intermediates)/broadcom/cle/v3d_packet_v33_pack.h: $(LOCAL_PATH)/cle/v3d_packet_v33.xml $(LOCAL_PATH)/cle/gen_pack_header.py
> -       $(call header-gen)
> +       $(call pack-header-gen)
>  
>  $(intermediates)/broadcom/cle/v3d_packet_v41_pack.h: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/cle/gen_pack_header.py
>  $(intermediates)/broadcom/cle/v3d_packet_v41_pack.h: PRIVATE_XML := $(LOCAL_PATH)/cle/v3d_packet_v33.xml
>  $(intermediates)/broadcom/cle/v3d_packet_v41_pack.h: PRIVATE_VER := 41
>  $(intermediates)/broadcom/cle/v3d_packet_v41_pack.h: $(LOCAL_PATH)/cle/v3d_packet_v33.xml $(LOCAL_PATH)/cle/gen_pack_header.py
> -       $(call header-gen)
> +       $(call pack-header-gen)
>  
>  $(intermediates)/broadcom/cle/v3d_packet_v42_pack.h: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/cle/gen_pack_header.py
>  $(intermediates)/broadcom/cle/v3d_packet_v42_pack.h: PRIVATE_XML := $(LOCAL_PATH)/cle/v3d_packet_v33.xml
>  $(intermediates)/broadcom/cle/v3d_packet_v42_pack.h: PRIVATE_VER := 42
>  $(intermediates)/broadcom/cle/v3d_packet_v42_pack.h: $(LOCAL_PATH)/cle/v3d_packet_v33.xml $(LOCAL_PATH)/cle/gen_pack_header.py
> -       $(call header-gen)
> +       $(call pack-header-gen)
>  
>  $(intermediates)/broadcom/cle/v3d_xml.h: $(addprefix $(MESA_TOP)/src/broadcom/,$(BROADCOM_GENXML_XML_FILES)) $(MESA_TOP)/src/intel/genxml/gen_zipped_file.py
>         @mkdir -p $(dir $@)
> -- 
> 2.17.1
> 
> _______________________________________________
> mesa-stable mailing list
> mesa-stable at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-stable

Hi Mauro,

These have a Fixes tag that would apply to the 18.1 branch, but you've
explicitly Cc'd them to the 18.2 branch. Would you like me to pull these into
18.1? If so there are some conflicts I'd like to have you look at. Please get
back to me soon as the last 18.1 release is happening tomorrow.

Thanks,
Dylan
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 228 bytes
Desc: signature
URL: <https://lists.freedesktop.org/archives/mesa-stable/attachments/20180920/15ef5e7c/attachment.sig>