intel: add dependency on genxml generated files

Drivers using genxml will start compilation before generated files are
created, so add a dependency to it.

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
Cc: mesa-stable@lists.freedesktop.org

diff --git a/src/gallium/drivers/iris/meson.build b/src/gallium/drivers/iris/meson.build
index 7454105c232f679705166d8706bb4cde744dccae..30c317fe4811a2e0d44b37d356019713f672ba1a 100644 (file)
--- a/src/gallium/drivers/iris/meson.build
+++ b/src/gallium/drivers/iris/meson.build
@@ -71,7 +71,7 @@ libiris = static_library(
   ],
   c_args : [c_vis_args, c_sse2_args],
   cpp_args : [cpp_vis_args, c_sse2_args],
-  dependencies : [dep_libdrm, dep_valgrind],
+  dependencies : [dep_libdrm, dep_valgrind, idep_genxml],
   link_with : [
     iris_gen_libs, libintel_common, libintel_compiler, libintel_dev, libisl,
     libblorp

diff --git a/src/intel/blorp/meson.build b/src/intel/blorp/meson.build
index c1201b0aa162b71ef71bc5f54aae3d3320981712..ff68d2551648aa7c172480cfe710fb25f10aadd7 100644 (file)
--- a/src/intel/blorp/meson.build
+++ b/src/intel/blorp/meson.build
@@ -33,5 +33,5 @@ libblorp = static_library(
   files_libblorp,
   include_directories : [inc_common, inc_intel],
   c_args : [c_vis_args, no_override_init_args],
-  dependencies : idep_nir_headers,
+  dependencies : [idep_nir_headers, idep_genxml],
 )

diff --git a/src/intel/common/meson.build b/src/intel/common/meson.build
index 332e978b0ad2a5a09dfa193a0fd3aff7e65c632d..ec45962502e59e26d9b4ddfba8af919af49363ab 100644 (file)
--- a/src/intel/common/meson.build
+++ b/src/intel/common/meson.build
@@ -43,5 +43,5 @@ libintel_common = static_library(
   include_directories : [inc_common, inc_intel],
   c_args : [c_vis_args, no_override_init_args],
   link_with : [libisl],
-  dependencies : [dep_expat, dep_libdrm, dep_thread],
+  dependencies : [dep_expat, dep_libdrm, dep_thread, idep_genxml],
 )

diff --git a/src/intel/genxml/meson.build b/src/intel/genxml/meson.build
index d0c982d0f8b1f6be32412be8f5dc1287a2982517..343b4fcc45f6ff186b585621a4cdb55e3c51cf14 100644 (file)
--- a/src/intel/genxml/meson.build
+++ b/src/intel/genxml/meson.build
@@ -57,3 +57,5 @@ foreach f : gen_xml_files
     capture : true,
   )
 endforeach
+
+idep_genxml = declare_dependency(sources : [gen_xml_pack, genX_bits_h, genX_xml_h])

diff --git a/src/intel/meson.build b/src/intel/meson.build
index 3c57e79d3251f188cf25475076a676dea34afa60..a5bb03e314a836b22a6bff91b5b98fa595ac7ad6 100644 (file)
--- a/src/intel/meson.build
+++ b/src/intel/meson.build
@@ -21,9 +21,9 @@
 c_sse2_args = ['-msse2', '-mstackrealign']
 inc_intel = include_directories('.')
 
+subdir('genxml')
 subdir('blorp')
 subdir('dev')
-subdir('genxml')
 subdir('isl')
 subdir('common')
 subdir('compiler')

diff --git a/src/intel/vulkan/meson.build b/src/intel/vulkan/meson.build
index 7fa43a6ad791f1a19b10a6f8243354e133bdc7f1..c32c10c5c721192134eca669c2ad37b03c0ada7f 100644 (file)
--- a/src/intel/vulkan/meson.build
+++ b/src/intel/vulkan/meson.build
@@ -203,7 +203,7 @@ libvulkan_intel = shared_library(
     libvulkan_util, libvulkan_wsi, libmesa_util,
   ],
   dependencies : [
-    dep_thread, dep_dl, dep_m, anv_deps, idep_nir,
+    dep_thread, dep_dl, dep_m, anv_deps, idep_nir, idep_genxml,
   ],
   c_args : anv_flags,
   link_args : ['-Wl,--build-id=sha1', ld_args_bsymbolic, ld_args_gc_sections],

diff --git a/src/mesa/drivers/dri/i965/meson.build b/src/mesa/drivers/dri/i965/meson.build
index 7cff7e523eaf1dc16de48641aa1d3017b7b3ed58..ca93af0ab10b2aaa0100409f5231900067ba91f7 100644 (file)
--- a/src/mesa/drivers/dri/i965/meson.build
+++ b/src/mesa/drivers/dri/i965/meson.build
@@ -189,7 +189,7 @@ libi965 = static_library(
     i965_gen_libs, libintel_common, libintel_dev, libisl, libintel_compiler,
     libblorp
   ],
-  dependencies : [dep_libdrm, dep_valgrind, idep_nir_headers],
+  dependencies : [dep_libdrm, dep_valgrind, idep_nir_headers, idep_genxml],
 )
 
 dri_drivers += libi965