From 48e48b8560ae6ad1728ced54f8f8f5245b3e99cf Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Mon, 8 Apr 2019 16:27:30 +0100 Subject: [PATCH] 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 Reviewed-by: Eric Engestrom Reviewed-by: Dylan Baker Cc: mesa-stable@lists.freedesktop.org --- src/gallium/drivers/iris/meson.build | 2 +- src/intel/blorp/meson.build | 2 +- src/intel/common/meson.build | 2 +- src/intel/genxml/meson.build | 2 ++ src/intel/meson.build | 2 +- src/intel/vulkan/meson.build | 2 +- src/mesa/drivers/dri/i965/meson.build | 2 +- 7 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/gallium/drivers/iris/meson.build b/src/gallium/drivers/iris/meson.build index 7454105c232..30c317fe481 100644 --- 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 c1201b0aa16..ff68d255164 100644 --- 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 332e978b0ad..ec45962502e 100644 --- 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 d0c982d0f8b..343b4fcc45f 100644 --- 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 3c57e79d325..a5bb03e314a 100644 --- 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 7fa43a6ad79..c32c10c5c72 100644 --- 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 7cff7e523ea..ca93af0ab10 100644 --- 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 -- 2.30.2