broadcom: fix dependencies in static_library() calls

The first argument is the name of the library, and the second argument
is the list of files; those two got a bit mixed up.

Fixes: 1ae8018a6a ("meson: Add support for the vc4 driver.")
Fixes: 4f3e380fa0 ("meson: Add support for the vc5 driver.")
Signed-off-by: Eric Engestrom <eric@igalia.com>
Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18593>
(cherry picked from commit 5bfca00d31)
This commit is contained in:
Eric Engestrom
2022-09-14 09:01:11 +01:00
committed by Dylan Baker
parent 6e574e2c81
commit fbc7e23afd
4 changed files with 7 additions and 7 deletions

View File

@@ -238,7 +238,7 @@
"description": "broadcom: fix dependencies in static_library() calls",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "1ae8018a6af81eec4832a57d9d0346aa3dd98d28"
},

View File

@@ -59,8 +59,8 @@ if dep_expat.found()
endif
libbroadcom_cle = static_library(
['broadcom_cle', v3d_xml_h],
'v3d_decoder.c',
'broadcom_cle',
['v3d_decoder.c', v3d_xml_h],
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_broadcom],
c_args : [no_override_init_args, expat_args],
gnu_symbol_visibility : 'hidden',

View File

@@ -47,8 +47,8 @@ libbroadcom_compiler_files = files(
)
libbroadcom_compiler = static_library(
['broadcom_compiler', v3d_xml_pack],
libbroadcom_compiler_files,
'broadcom_compiler',
[libbroadcom_compiler_files, v3d_xml_pack],
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_broadcom],
c_args : [no_override_init_args],
gnu_symbol_visibility : 'hidden',

View File

@@ -25,8 +25,8 @@ libbroadcom_qpu_files = files(
)
libbroadcom_qpu = static_library(
['broadcom_qpu', v3d_xml_pack],
libbroadcom_qpu_files,
'broadcom_qpu',
[libbroadcom_qpu_files, v3d_xml_pack],
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_broadcom],
c_args : [no_override_init_args],
gnu_symbol_visibility : 'hidden',