fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-24 12:30:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5
mesa/src/broadcom
History
Mauro Rossi 3341429d74 android: broadcom/genxml: fix collision with intel/genxml header-gen macro 
Fixes the following building error, happening when building both intel and broadcom:

Gen Header: libmesa_broadcom_genxml_32 <= v3d_packet_v21_pack.h
FAILED: 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 \
> 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@lists.freedesktop.org>
Acked-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Signed-off-by: Mauro Rossi <issor.oruam@gmail.com>
2018-09-15 09:14:33 +02:00
..
cle move u_math to src/util 2018-09-07 10:21:26 -07:00
clif v3d: Dump the contents off all the buffers in CLIF mode. 2018-07-30 14:29:01 -07:00
common v3d: Emit the VCM_CACHE_SIZE packet. 2018-08-06 13:03:23 -07:00
compiler v3d: Fix setup of the VCM cache size. 2018-09-07 08:11:38 -07:00
qpu v3d: Add support for the TMUWT instruction. 2018-07-31 16:05:04 -07:00
.editorconfig broadcom: add editorconfig 2017-07-25 14:44:52 -07:00
.gitignore broadcom/vc5: Introduce v3dx_macros.h and v3dx_pack.h headers. 2018-01-12 21:51:40 -08:00
Android.cle.mk broadcom/genxml: Introduce a V3D packet/struct decoder. 2017-07-25 14:44:52 -07:00
Android.genxml.mk android: broadcom/genxml: fix collision with intel/genxml header-gen macro 2018-09-15 09:14:33 +02:00
Android.mk broadcom/genxml: Introduce a V3D packet/struct decoder. 2017-07-25 14:44:52 -07:00
Makefile.am Revert "configure: allow building with python3" 2018-08-24 11:14:15 +01:00
Makefile.cle.am broadcom: Fix out-of-tree build include path 2017-10-05 15:03:11 -07:00
Makefile.genxml.am v3d: Merge the V3D 4.1 and 4.2 XML into V3D 3.3'x XML. 2018-06-29 13:36:28 -07:00
Makefile.sources v3d: Implement a small immediates optimization, based on VC4's. 2018-07-23 10:21:43 -07:00
Makefile.v3d.am v3d: Rename the driver files from "vc5" to "v3d". 2018-05-16 21:19:07 +01:00
meson.build vc4: Fix meson build when enabled without v3d. 2018-07-29 19:13:29 -07:00