KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Lionel Landwerlin 2019-04-08 16:27:30 +01:00
parent 4b63f57cbc
commit 48e48b8560
7 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gallium/drivers/iris/meson.build
View File

@ -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

2
src/intel/blorp/meson.build
View File

@ -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],
)

2
src/intel/common/meson.build
View File

@ -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],
)

2
src/intel/genxml/meson.build
View File

@ -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])

2
src/intel/meson.build
View File

@ -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')

2
src/intel/vulkan/meson.build
View File

@ -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],

2
src/mesa/drivers/dri/i965/meson.build
View File

@ -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