diff options
| author | Eric Engestrom <eric@igalia.com> | 2022-09-14 09:01:11 +0100 |
|---|---|---|
| committer | Dylan Baker <dylan.c.baker@intel.com> | 2022-09-15 10:15:56 -0700 |
| commit | fbc7e23afda9d9c1533e8f396902f840e9f443c6 (patch) | |
| tree | 54e1e95564a57f4831c0711ac27789a9c33e4f24 | |
| parent | 6e574e2c81181132347edfbb1e81551da13df5e6 (diff) | |
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: 1ae8018a6af81eec4832 ("meson: Add support for the vc4 driver.")
Fixes: 4f3e380fa0f192f90e66 ("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 5bfca00d318e8fdbe6914fc358d24af983086f15)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | src/broadcom/cle/meson.build | 4 | ||||
| -rw-r--r-- | src/broadcom/compiler/meson.build | 4 | ||||
| -rw-r--r-- | src/broadcom/qpu/meson.build | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/.pick_status.json b/.pick_status.json index 74f938ca979..879dd64fbce 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -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" }, diff --git a/src/broadcom/cle/meson.build b/src/broadcom/cle/meson.build index 4cab2b38dda..31a0d5bfa94 100644 --- a/src/broadcom/cle/meson.build +++ b/src/broadcom/cle/meson.build @@ -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', diff --git a/src/broadcom/compiler/meson.build b/src/broadcom/compiler/meson.build index 311da12463c..ab4d3ba0788 100644 --- a/src/broadcom/compiler/meson.build +++ b/src/broadcom/compiler/meson.build @@ -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', diff --git a/src/broadcom/qpu/meson.build b/src/broadcom/qpu/meson.build index eea1f9bb058..cfb929cb859 100644 --- a/src/broadcom/qpu/meson.build +++ b/src/broadcom/qpu/meson.build @@ -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', |