Mesa (master): panfrost: add missing dependency on midgard_pack.h

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: a322924d9cf4557af5fb11c95c1646f110a21aba
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a322924d9cf4557af5fb11c95c1646f110a21aba

Author: Jonathan Marek <jonathan at marek.ca>
Date:   Thu Aug 13 11:18:13 2020 -0400

panfrost: add missing dependency on midgard_pack.h

Fixes build failing when libpanfrost is built before midgard_pack.

Signed-off-by: Jonathan Marek <jonathan at marek.ca>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6093>

---

 src/gallium/drivers/panfrost/meson.build | 3 ++-
 src/panfrost/lib/meson.build             | 5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/panfrost/meson.build b/src/gallium/drivers/panfrost/meson.build
index 89f877a5bb2..7222d40c3c3 100644
--- a/src/gallium/drivers/panfrost/meson.build
+++ b/src/gallium/drivers/panfrost/meson.build
@@ -64,7 +64,8 @@ libpanfrost = static_library(
   dependencies: [
     dep_thread,
     dep_libdrm,
-    idep_nir
+    idep_nir,
+    idep_midgard_pack
   ],
   include_directories : panfrost_includes,
   c_args : [c_msvc_compat_args, compile_args_panfrost],
diff --git a/src/panfrost/lib/meson.build b/src/panfrost/lib/meson.build
index a24eebca002..efcc55e2942 100644
--- a/src/panfrost/lib/meson.build
+++ b/src/panfrost/lib/meson.build
@@ -50,6 +50,11 @@ midgard_pack = custom_target(
   capture : true,
 )
 
+idep_midgard_pack = declare_dependency(
+  sources : [midgard_pack],
+  include_directories : include_directories('.'),
+)
+
 libpanfrost_lib = static_library(
   'panfrost_lib',
   [libpanfrost_lib_files, midgard_pack],