OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

intel/tools: add intel device meson dependencies

Browse Source 
idep_intel_dev ensures that headers are generated before dependent
source files are compiled.  Some tools have been building without that
dependency, and encounter intermittent compilation errors on
sufficiently parallel builds.

Any target which depends on idep_intel_dev will link with
libintel_dev.  Redundant link instructions can be removed.

Reviewed-by: Caio Oliveira <caio.oliveira@intel.com>

Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/10604
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27600>
This commit is contained in:
Mark Janes
2024-02-13 10:02:12 -08:00
committed by Marge Bot
parent 161a90abbd
commit e56f810316
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/intel/tools/meson.build
View File

@@ -75,9 +75,8 @@ error2aub = executable(
error2hangdump = executable(
'intel_error2hangdump',
files('error2hangdump.c'),
dependencies : [dep_zlib, dep_dl, dep_thread, dep_m],
dependencies : [dep_zlib, dep_dl, dep_thread, dep_m, idep_intel_dev],
include_directories : [inc_include, inc_src, inc_intel],
link_with : [libintel_dev],
c_args : [no_override_init_args],
gnu_symbol_visibility : 'hidden',
install : true
@@ -88,7 +87,7 @@ intel_hang_replay = executable(
files('intel_hang_replay.c'),
dependencies : [idep_intel_dev, idep_libintel_common, dep_libdrm, dep_dl, dep_thread, dep_m],
include_directories : [inc_include, inc_src, inc_intel],
link_with : [libintel_dev, libintel_compiler],
link_with : [libintel_compiler],
c_args : [no_override_init_args],
gnu_symbol_visibility : 'hidden',
install : true
@@ -114,7 +113,7 @@ configure_file(
libintel_sanitize_gpu = shared_library(
'intel_sanitize_gpu',
files('intel_sanitize_gpu.c'),
dependencies : [idep_mesautil, dep_dl, dep_thread],
dependencies : [idep_mesautil, dep_dl, dep_thread, idep_intel_dev],
include_directories : [inc_include, inc_src, inc_intel],
link_with : libintel_common,
c_args : [no_override_init_args, sse2_args],
@@ -183,9 +182,9 @@ if with_tools.contains('intel-ui')
intel_hang_viewer = executable(
'intel_hang_viewer',
files('intel_hang_viewer.cpp', 'aubinator_viewer_decoder.cpp'),
dependencies : [idep_mesautil, dep_zlib, dep_dl, dep_thread, dep_m, libintel_imgui_gtk_dep],
dependencies : [idep_mesautil, dep_zlib, dep_dl, dep_thread, dep_m, libintel_imgui_gtk_dep, idep_intel_dev],
include_directories : [inc_include, inc_src, inc_intel],
link_with : [libintel_common, libintel_compiler, libintel_dev],
link_with : [libintel_common, libintel_compiler],
c_args : [no_override_init_args],
gnu_symbol_visibility : 'hidden',
cpp_args : ['-fpermissive', '-Wno-parentheses'],