From 27f1bfe471d87783c2dd2be4cd3d0bbc1ae373cc Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Sun, 29 Jul 2018 19:11:53 -0700
Subject: [PATCH] vc4: Fix meson build when enabled without v3d.

Reported-by: Rob Clark <robdclark@gmail.com>
Fixes: e92959c4e03c ("v3d: Pass the whole clif_dump structure to v3d_print_group().")
---
 src/broadcom/compiler/meson.build   |  2 ++
 src/broadcom/meson.build            | 45 +++++++++++++++--------------
 src/broadcom/qpu/meson.build        |  2 ++
 src/gallium/drivers/vc4/meson.build |  2 +-
 4 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/src/broadcom/compiler/meson.build b/src/broadcom/compiler/meson.build
index 1bd43bf2c2d..86ef365aa5c 100644
--- a/src/broadcom/compiler/meson.build
+++ b/src/broadcom/compiler/meson.build
@@ -47,3 +47,5 @@ libbroadcom_compiler = static_library(
   dependencies : [dep_libdrm, dep_valgrind, idep_nir_headers],
   build_by_default : false,
 )
+
+v3d_libs += libbroadcom_compiler
diff --git a/src/broadcom/meson.build b/src/broadcom/meson.build
index e4f57152613..d3ea362f200 100644
--- a/src/broadcom/meson.build
+++ b/src/broadcom/meson.build
@@ -23,35 +23,36 @@ inc_broadcom = include_directories('.', 'cle')
 subdir('cle')
 
 v3d_versions = ['33', '41', '42']
+v3d_libs = []
 
 if with_gallium_v3d
   subdir('compiler')
   subdir('qpu')
+endif
 
-  per_version_libs = []
-  foreach ver : v3d_versions
-    per_version_libs += static_library(
-      'libbroadcom-v' + ver,
-      [
-        files('clif/v3dx_dump.c'),
-        v3d_xml_pack
-      ],
-      include_directories : [inc_common, inc_broadcom, inc_src],
-      c_args : [c_vis_args, no_override_init_args, '-DV3D_VERSION=' + ver],
-      dependencies: [dep_valgrind, dep_thread],
-    )
-  endforeach
-
-  libbroadcom_v3d = static_library(
-    'libbroadcom_v3d',
+per_version_libs = []
+foreach ver : v3d_versions
+  per_version_libs += static_library(
+    'libbroadcom-v' + ver,
     [
-      files('common/v3d_debug.c', 'clif/clif_dump.c'),
-      v3d_xml_pack,
+      files('clif/v3dx_dump.c'),
+      v3d_xml_pack
     ],
     include_directories : [inc_common, inc_broadcom, inc_src],
-    c_args : [c_vis_args, no_override_init_args],
-    link_whole : [libbroadcom_compiler, libbroadcom_qpu] + per_version_libs,
-    build_by_default : false,
+    c_args : [c_vis_args, no_override_init_args, '-DV3D_VERSION=' + ver],
     dependencies: [dep_valgrind, dep_thread],
   )
-endif
+endforeach
+
+libbroadcom_v3d = static_library(
+  'libbroadcom_v3d',
+  [
+    files('common/v3d_debug.c', 'clif/clif_dump.c'),
+    v3d_xml_pack,
+  ],
+  include_directories : [inc_common, inc_broadcom, inc_src],
+  c_args : [c_vis_args, no_override_init_args],
+  link_whole : v3d_libs + per_version_libs,
+  build_by_default : false,
+  dependencies: [dep_valgrind, dep_thread],
+)
diff --git a/src/broadcom/qpu/meson.build b/src/broadcom/qpu/meson.build
index 5521a80ceec..8a40016064d 100644
--- a/src/broadcom/qpu/meson.build
+++ b/src/broadcom/qpu/meson.build
@@ -33,6 +33,8 @@ libbroadcom_qpu = static_library(
   build_by_default : false,
 )
 
+v3d_libs += libbroadcom_qpu
+
 test(
   'qpu_disasm',
   executable(
diff --git a/src/gallium/drivers/vc4/meson.build b/src/gallium/drivers/vc4/meson.build
index ef7e7bcac5c..50adcc25f25 100644
--- a/src/gallium/drivers/vc4/meson.build
+++ b/src/gallium/drivers/vc4/meson.build
@@ -115,6 +115,6 @@ libvc4 = static_library(
 
 driver_vc4 = declare_dependency(
   compile_args : '-DGALLIUM_VC4',
-  link_with : [libvc4, libvc4winsys, libbroadcom_cle],
+  link_with : [libvc4, libvc4winsys, libbroadcom_cle, libbroadcom_v3d],
   dependencies : idep_nir,
 )
-- 
2.30.2