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

[Rob Herring]

On Mon, Sep 3, 2018 at 4:27 PM Eric Anholt  wrote:
>
> Mauro Rossi  writes:
>
> > Fixes the following building error, happening when building both intel and 
> > broadcom:
>
> I wish someone maintaining android Mesa would work on making the meson
> build work for them instead of just continuing to maintain the
> Android.mk mess.

Trust me, no one likes this thankless job.

How do you envision that would work without meson support in the
Android build system? I went down the path of defining a "prebuilt"
Android.mk target which calls meson to do a build. This was a dead end
because the Android.mk gets none of the build environment. It's
possible to dump all that out and re-construct those settings. That
seems horribly fragile, and I'd guess we'd just be switching from mesa
to AOSP breaking the build. Of course the latter already happens too.
Finally, I'm pretty sure this would not be accepted for the AOSP copy
of mesa (which is trying to track mainline).

The other route would be some sort automatic meson to Android BP build
file translation. Such a thing exists for autotools, but I've never
seen it in actual use anywhere.

Either way, this seems like a unicorn to me until AOSP provides some
support to support meson. If you really want to force the issue, strip
all the Android.mk files out of mesa. Though that will mainly put the
pain on downstream device trees, not AOSP.

Rob
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [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  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 
> 
> 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" 
> Signed-off-by: Mauro Rossi 

Reviewed-by: Emil Velikov 

-Emil
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

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

[Eric Anholt]

Mauro Rossi  writes:

> Fixes the following building error, happening when building both intel and 
> broadcom:

I wish someone maintaining android Mesa would work on making the meson
build work for them instead of just continuing to maintain the
Android.mk mess.  However, whatever it takes to make it build for now
gets:

Acked-by: Eric Anholt 


signature.asc
Description: PGP signature
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

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

[Mauro Rossi]

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 

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" 
Signed-off-by: Mauro Rossi 
---
 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-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev