Mesa (master): meson: add idep_mesautil to components using simple_mtx.h
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Wed Nov 25 02:41:37 UTC 2020
Module: Mesa
Branch: master
Commit: a1281f8a995bcbe6144b43f27bb0c89c28f2a3ba
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a1281f8a995bcbe6144b43f27bb0c89c28f2a3ba
Author: Mark Janes <markjanes at swizzler.org>
Date: Tue Nov 24 17:31:59 2020 -0800
meson: add idep_mesautil to components using simple_mtx.h
If valgrind is installed, these components need to find valgrind.h.
Fixes: 53f7d539cd9 ("util: Add helgrind support for simple_mtx")
Closes: #3876
Acked-by: Rob Clark <robclark at freedesktop.org>
---
src/compiler/glsl/glcpp/meson.build | 2 +-
src/compiler/glsl/tests/meson.build | 6 +++---
src/etnaviv/drm-shim/meson.build | 2 +-
src/gallium/auxiliary/pipe-loader/meson.build | 2 +-
src/gallium/drivers/etnaviv/meson.build | 2 +-
src/gallium/drivers/lima/meson.build | 2 +-
src/gallium/drivers/r300/meson.build | 2 +-
src/gallium/drivers/radeonsi/meson.build | 2 +-
src/gallium/drivers/svga/meson.build | 1 +
src/gallium/drivers/swr/meson.build | 2 +-
src/gallium/drivers/tegra/meson.build | 2 +-
src/gallium/drivers/virgl/meson.build | 2 +-
src/gallium/drivers/virgl/tests/meson.build | 2 +-
src/gallium/drivers/zink/meson.build | 2 +-
src/gallium/frontends/clover/meson.build | 5 +++--
src/gallium/frontends/omx/meson.build | 2 +-
src/gallium/targets/dri/meson.build | 2 +-
src/gallium/targets/graw-null/meson.build | 1 +
src/gallium/winsys/amdgpu/drm/meson.build | 2 +-
src/gallium/winsys/etnaviv/drm/meson.build | 2 +-
src/gallium/winsys/lima/drm/meson.build | 1 +
src/gallium/winsys/radeon/drm/meson.build | 2 +-
src/gallium/winsys/svga/drm/meson.build | 2 +-
src/gallium/winsys/tegra/drm/meson.build | 1 +
src/gallium/winsys/v3d/drm/meson.build | 1 +
src/gallium/winsys/virgl/drm/meson.build | 2 +-
src/gallium/winsys/virgl/vtest/meson.build | 2 +-
src/mesa/drivers/dri/swrast/meson.build | 2 +-
src/mesa/main/tests/meson.build | 2 +-
src/mesa/state_tracker/tests/meson.build | 2 +-
30 files changed, 34 insertions(+), 28 deletions(-)
diff --git a/src/compiler/glsl/glcpp/meson.build b/src/compiler/glsl/glcpp/meson.build
index bdfbb80735f..a7dce6d9a3d 100644
--- a/src/compiler/glsl/glcpp/meson.build
+++ b/src/compiler/glsl/glcpp/meson.build
@@ -71,7 +71,7 @@ libglcpp_standalone = static_library(
glcpp = executable(
'glcpp',
'glcpp.c',
- dependencies : [dep_m, idep_getopt],
+ dependencies : [dep_m, idep_getopt, idep_mesautil],
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
link_with : [libglcpp_standalone, libglsl_util],
c_args : [no_override_init_args, c_msvc_compat_args],
diff --git a/src/compiler/glsl/tests/meson.build b/src/compiler/glsl/tests/meson.build
index db89b48ec63..dea2516bbe7 100644
--- a/src/compiler/glsl/tests/meson.build
+++ b/src/compiler/glsl/tests/meson.build
@@ -46,7 +46,7 @@ test(
gnu_symbol_visibility : 'hidden',
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_glsl],
link_with : [libglsl, libglsl_standalone, libglsl_util],
- dependencies : [dep_clock, dep_thread, idep_gtest],
+ dependencies : [dep_clock, dep_thread, idep_gtest, idep_mesautil],
),
suite : ['compiler', 'glsl'],
)
@@ -62,7 +62,7 @@ test(
gnu_symbol_visibility : 'hidden',
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_glsl],
link_with : [libglsl, libglsl_util],
- dependencies : [dep_thread, idep_gtest],
+ dependencies : [dep_thread, idep_gtest, idep_mesautil],
),
suite : ['compiler', 'glsl'],
)
@@ -76,7 +76,7 @@ test(
gnu_symbol_visibility : 'hidden',
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_glsl],
link_with : [libglsl, libglsl_util],
- dependencies : [dep_thread, idep_gtest],
+ dependencies : [dep_thread, idep_gtest, idep_mesautil],
),
suite : ['compiler', 'glsl'],
)
diff --git a/src/etnaviv/drm-shim/meson.build b/src/etnaviv/drm-shim/meson.build
index bb734c93093..29457f9f324 100644
--- a/src/etnaviv/drm-shim/meson.build
+++ b/src/etnaviv/drm-shim/meson.build
@@ -24,7 +24,7 @@ libetnaviv_noop_drm_shim = shared_library(
'etnaviv_noop_drm_shim',
'etnaviv_noop.c',
include_directories: [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
- dependencies: dep_drm_shim,
+ dependencies: [dep_drm_shim, idep_mesautil],
gnu_symbol_visibility : 'hidden',
install : true,
)
diff --git a/src/gallium/auxiliary/pipe-loader/meson.build b/src/gallium/auxiliary/pipe-loader/meson.build
index 06a9137850a..1c4dbbf4a74 100644
--- a/src/gallium/auxiliary/pipe-loader/meson.build
+++ b/src/gallium/auxiliary/pipe-loader/meson.build
@@ -72,6 +72,6 @@ libpipe_loader_dynamic = static_library(
],
gnu_symbol_visibility : 'hidden',
link_with : [libpipe_loader_links],
- dependencies : [dep_libdrm, idep_xmlconfig],
+ dependencies : [dep_libdrm, idep_xmlconfig, idep_mesautil],
build_by_default : false,
)
diff --git a/src/gallium/drivers/etnaviv/meson.build b/src/gallium/drivers/etnaviv/meson.build
index 8805fcc7ef2..94c64914570 100644
--- a/src/gallium/drivers/etnaviv/meson.build
+++ b/src/gallium/drivers/etnaviv/meson.build
@@ -110,7 +110,7 @@ libetnaviv = static_library(
inc_include, inc_src, inc_gallium, inc_gallium_aux, inc_etnaviv,
],
link_with: libetnaviv_drm,
- dependencies : [dep_libdrm, idep_nir_headers],
+ dependencies : [dep_libdrm, idep_nir_headers, idep_mesautil],
)
etnaviv_compiler = executable(
diff --git a/src/gallium/drivers/lima/meson.build b/src/gallium/drivers/lima/meson.build
index 1b1affb0b24..fbc45a60191 100644
--- a/src/gallium/drivers/lima/meson.build
+++ b/src/gallium/drivers/lima/meson.build
@@ -99,7 +99,7 @@ liblima = static_library(
inc_src, inc_include, inc_gallium, inc_gallium_aux, inc_gallium_drivers,
inc_panfrost
],
- dependencies : [dep_libdrm, idep_nir_headers],
+ dependencies : [dep_libdrm, idep_nir_headers, idep_mesautil],
)
driver_lima = declare_dependency(
diff --git a/src/gallium/drivers/r300/meson.build b/src/gallium/drivers/r300/meson.build
index ee8572444ea..41e09bd56fc 100644
--- a/src/gallium/drivers/r300/meson.build
+++ b/src/gallium/drivers/r300/meson.build
@@ -126,7 +126,7 @@ libr300 = static_library(
inc_mesa,
],
gnu_symbol_visibility : 'hidden',
- dependencies : [dep_libdrm_radeon, dep_llvm],
+ dependencies : [dep_libdrm_radeon, dep_llvm, idep_mesautil],
)
driver_r300 = declare_dependency(
diff --git a/src/gallium/drivers/radeonsi/meson.build b/src/gallium/drivers/radeonsi/meson.build
index cf4414a2ad2..22d5b1e58f3 100644
--- a/src/gallium/drivers/radeonsi/meson.build
+++ b/src/gallium/drivers/radeonsi/meson.build
@@ -104,7 +104,7 @@ libradeonsi = static_library(
],
c_args : ['-Wstrict-overflow=0'],
gnu_symbol_visibility : 'hidden',
- dependencies : [dep_llvm, dep_clock, dep_libdrm_radeon, idep_nir_headers, idep_amdgfxregs_h],
+ dependencies : [dep_llvm, dep_clock, dep_libdrm_radeon, idep_nir_headers, idep_amdgfxregs_h, idep_mesautil],
)
driver_radeonsi = declare_dependency(
diff --git a/src/gallium/drivers/svga/meson.build b/src/gallium/drivers/svga/meson.build
index 8dcdadd6e1d..123013dd47c 100644
--- a/src/gallium/drivers/svga/meson.build
+++ b/src/gallium/drivers/svga/meson.build
@@ -87,6 +87,7 @@ libsvga = static_library(
inc_src, inc_include, inc_gallium, inc_gallium_aux,
include_directories('include')
],
+ dependencies : idep_mesautil,
)
driver_svga = declare_dependency(
diff --git a/src/gallium/drivers/swr/meson.build b/src/gallium/drivers/swr/meson.build
index 0e6f9214f3c..ac712d80461 100644
--- a/src/gallium/drivers/swr/meson.build
+++ b/src/gallium/drivers/swr/meson.build
@@ -397,7 +397,7 @@ libmesaswr = static_library(
],
gnu_symbol_visibility : 'hidden',
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, swr_incs],
- dependencies : dep_llvm,
+ dependencies : [dep_llvm, idep_mesautil],
)
link_libs = [libmesaswr]
diff --git a/src/gallium/drivers/tegra/meson.build b/src/gallium/drivers/tegra/meson.build
index e428cea32de..3c79a27c43b 100644
--- a/src/gallium/drivers/tegra/meson.build
+++ b/src/gallium/drivers/tegra/meson.build
@@ -33,7 +33,7 @@ libtegra = static_library(
inc_include, inc_src, inc_gallium, inc_gallium_aux, inc_gallium_drivers,
inc_gallium_winsys,
],
- dependencies : dep_libdrm,
+ dependencies : [dep_libdrm, idep_mesautil],
)
driver_tegra = declare_dependency(
diff --git a/src/gallium/drivers/virgl/meson.build b/src/gallium/drivers/virgl/meson.build
index b0ff235d4ce..6a089a51290 100644
--- a/src/gallium/drivers/virgl/meson.build
+++ b/src/gallium/drivers/virgl/meson.build
@@ -37,7 +37,7 @@ libvirgl = static_library(
[ files_libvirgl ],
gnu_symbol_visibility : 'hidden',
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_virtio],
- dependencies : dep_libdrm
+ dependencies : [dep_libdrm, idep_mesautil],
)
driver_virgl = declare_dependency(
diff --git a/src/gallium/drivers/virgl/tests/meson.build b/src/gallium/drivers/virgl/tests/meson.build
index 53c68f9ee3d..595e63675a5 100644
--- a/src/gallium/drivers/virgl/tests/meson.build
+++ b/src/gallium/drivers/virgl/tests/meson.build
@@ -23,7 +23,7 @@ test(
executable(
'virgl_staging_mgr_test',
files('virgl_staging_mgr_test.cpp'),
- dependencies : [dep_thread, idep_gtest],
+ dependencies : [dep_thread, idep_gtest, idep_mesautil],
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_virtio, include_directories('..')],
link_with : [libvirgl, libgallium],
),
diff --git a/src/gallium/drivers/zink/meson.build b/src/gallium/drivers/zink/meson.build
index eff8bfa0341..ec47d658b42 100644
--- a/src/gallium/drivers/zink/meson.build
+++ b/src/gallium/drivers/zink/meson.build
@@ -66,7 +66,7 @@ libzink = static_library(
[files_libzink, zink_device_info, zink_nir_algebraic_c],
gnu_symbol_visibility : 'hidden',
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_vulkan_wsi, inc_vulkan_util],
- dependencies: [dep_vulkan, idep_nir_headers],
+ dependencies: [dep_vulkan, idep_nir_headers, idep_mesautil],
)
driver_zink = declare_dependency(
diff --git a/src/gallium/frontends/clover/meson.build b/src/gallium/frontends/clover/meson.build
index 4f26db64d07..d76eb20a830 100644
--- a/src/gallium/frontends/clover/meson.build
+++ b/src/gallium/frontends/clover/meson.build
@@ -72,7 +72,7 @@ libclllvm = static_library(
)),
],
gnu_symbol_visibility : 'hidden',
- dependencies : [dep_llvm, dep_elf, dep_llvmspirvlib],
+ dependencies : [dep_llvm, dep_elf, dep_llvmspirvlib, idep_mesautil],
)
libclspirv = static_library(
@@ -81,7 +81,7 @@ libclspirv = static_library(
include_directories : clover_incs,
cpp_args : [clover_opencl_cpp_args, clover_spirv_cpp_args],
gnu_symbol_visibility : 'hidden',
- dependencies : [dep_spirv_tools],
+ dependencies : [dep_spirv_tools, idep_mesautil],
)
libclnir = static_library(
@@ -161,4 +161,5 @@ libclover = static_library(
],
gnu_symbol_visibility : 'hidden',
link_with : [libclllvm, libclspirv, libclnir],
+ dependencies : idep_mesautil,
)
diff --git a/src/gallium/frontends/omx/meson.build b/src/gallium/frontends/omx/meson.build
index ee19145b2a9..d0d2261d9b7 100644
--- a/src/gallium/frontends/omx/meson.build
+++ b/src/gallium/frontends/omx/meson.build
@@ -69,5 +69,5 @@ libomx_st = static_library(
c_args : ['-fcommon'],
gnu_symbol_visibility : 'hidden',
include_directories : inc_st_omx,
- dependencies : dep_st_omx,
+ dependencies : [dep_st_omx, idep_mesautil],
)
diff --git a/src/gallium/targets/dri/meson.build b/src/gallium/targets/dri/meson.build
index 111b888922e..be568b250aa 100644
--- a/src/gallium/targets/dri/meson.build
+++ b/src/gallium/targets/dri/meson.build
@@ -53,7 +53,7 @@ libgallium_dri = shared_library(
libswkmsdri,
],
dependencies : [
- dep_selinux, dep_libdrm, dep_llvm, dep_thread, idep_xmlconfig,
+ dep_selinux, dep_libdrm, dep_llvm, dep_thread, idep_xmlconfig, idep_mesautil,
driver_swrast, driver_r300, driver_r600, driver_radeonsi, driver_nouveau,
driver_kmsro, driver_v3d, driver_vc4, driver_freedreno, driver_etnaviv,
driver_tegra, driver_i915, driver_svga, driver_virgl,
diff --git a/src/gallium/targets/graw-null/meson.build b/src/gallium/targets/graw-null/meson.build
index 7755c396e96..594798aabc8 100644
--- a/src/gallium/targets/graw-null/meson.build
+++ b/src/gallium/targets/graw-null/meson.build
@@ -24,6 +24,7 @@ libgraw_util = static_library(
c_args : [c_msvc_compat_args],
gnu_symbol_visibility : 'hidden',
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
+ dependencies : idep_mesautil,
)
libgraw_null = shared_library(
diff --git a/src/gallium/winsys/amdgpu/drm/meson.build b/src/gallium/winsys/amdgpu/drm/meson.build
index d6793eff5d7..c73ff380282 100644
--- a/src/gallium/winsys/amdgpu/drm/meson.build
+++ b/src/gallium/winsys/amdgpu/drm/meson.build
@@ -31,5 +31,5 @@ libamdgpuwinsys = static_library(
],
gnu_symbol_visibility : 'hidden',
link_with : libamdgpu_addrlib,
- dependencies : [dep_llvm, dep_libdrm_amdgpu, idep_amdgfxregs_h],
+ dependencies : [dep_llvm, dep_libdrm_amdgpu, idep_amdgfxregs_h, idep_mesautil],
)
diff --git a/src/gallium/winsys/etnaviv/drm/meson.build b/src/gallium/winsys/etnaviv/drm/meson.build
index f5491941755..ab52587aac8 100644
--- a/src/gallium/winsys/etnaviv/drm/meson.build
+++ b/src/gallium/winsys/etnaviv/drm/meson.build
@@ -26,5 +26,5 @@ libetnavivdrm = static_library(
inc_etnaviv,
],
link_with: libetnaviv_drm,
- dependencies : [dep_libdrm, idep_nir_headers],
+ dependencies : [dep_libdrm, idep_nir_headers, idep_mesautil],
)
diff --git a/src/gallium/winsys/lima/drm/meson.build b/src/gallium/winsys/lima/drm/meson.build
index 2939571e590..cc8a0720eb7 100644
--- a/src/gallium/winsys/lima/drm/meson.build
+++ b/src/gallium/winsys/lima/drm/meson.build
@@ -26,4 +26,5 @@ liblimawinsys = static_library(
inc_src, inc_include,
inc_gallium, inc_gallium_aux, inc_gallium_drivers,
],
+ dependencies : idep_mesautil,
)
diff --git a/src/gallium/winsys/radeon/drm/meson.build b/src/gallium/winsys/radeon/drm/meson.build
index ae5382a5d99..4341d813db0 100644
--- a/src/gallium/winsys/radeon/drm/meson.build
+++ b/src/gallium/winsys/radeon/drm/meson.build
@@ -25,5 +25,5 @@ libradeonwinsys = static_library(
'radeon_drm_winsys.c', 'radeon_drm_winsys.h'),
include_directories : [inc_src, inc_include, inc_gallium, inc_gallium_aux],
gnu_symbol_visibility : 'hidden',
- dependencies : [dep_libdrm_radeon],
+ dependencies : [dep_libdrm_radeon, idep_mesautil],
)
diff --git a/src/gallium/winsys/svga/drm/meson.build b/src/gallium/winsys/svga/drm/meson.build
index 5f3065e10a5..1d91ee207c5 100644
--- a/src/gallium/winsys/svga/drm/meson.build
+++ b/src/gallium/winsys/svga/drm/meson.build
@@ -43,5 +43,5 @@ libsvgadrm = static_library(
inc_src, inc_include, inc_gallium, inc_gallium_aux,
include_directories('../../../drivers/svga', '../../../drivers/svga/include'),
],
- dependencies : dep_libdrm,
+ dependencies : [dep_libdrm, idep_mesautil],
)
diff --git a/src/gallium/winsys/tegra/drm/meson.build b/src/gallium/winsys/tegra/drm/meson.build
index 46a6ab782a5..c1102c8fd7b 100644
--- a/src/gallium/winsys/tegra/drm/meson.build
+++ b/src/gallium/winsys/tegra/drm/meson.build
@@ -25,6 +25,7 @@ libtegradrm = static_library(
inc_include, inc_src, inc_gallium, inc_gallium_aux, inc_gallium_drivers,
inc_gallium_winsys
],
+ dependencies : idep_mesautil,
)
driver_tegra = declare_dependency(
diff --git a/src/gallium/winsys/v3d/drm/meson.build b/src/gallium/winsys/v3d/drm/meson.build
index 58577709e24..3d3cc5b3f01 100644
--- a/src/gallium/winsys/v3d/drm/meson.build
+++ b/src/gallium/winsys/v3d/drm/meson.build
@@ -26,4 +26,5 @@ libv3dwinsys = static_library(
inc_gallium, inc_gallium_aux, inc_gallium_drivers,
],
gnu_symbol_visibility : 'hidden',
+ dependencies : idep_mesautil,
)
diff --git a/src/gallium/winsys/virgl/drm/meson.build b/src/gallium/winsys/virgl/drm/meson.build
index ba6439a5f41..d4decb0cfbe 100644
--- a/src/gallium/winsys/virgl/drm/meson.build
+++ b/src/gallium/winsys/virgl/drm/meson.build
@@ -22,6 +22,6 @@ libvirgldrm = static_library(
'virgldrm',
'virgl_drm_winsys.c',
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_gallium_drivers, inc_virtio],
- dependencies : [dep_libdrm, dep_libvirglcommon],
+ dependencies : [dep_libdrm, dep_libvirglcommon, idep_mesautil],
gnu_symbol_visibility : 'hidden',
)
diff --git a/src/gallium/winsys/virgl/vtest/meson.build b/src/gallium/winsys/virgl/vtest/meson.build
index caf81220f10..5f9f3d3dfab 100644
--- a/src/gallium/winsys/virgl/vtest/meson.build
+++ b/src/gallium/winsys/virgl/vtest/meson.build
@@ -22,6 +22,6 @@ libvirglvtest = static_library(
'virglvtest',
['virgl_vtest_socket.c', 'virgl_vtest_winsys.c'],
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_gallium_drivers, inc_virtio],
- dependencies : dep_libvirglcommon,
+ dependencies : [dep_libvirglcommon, idep_mesautil],
gnu_symbol_visibility : 'hidden',
)
diff --git a/src/mesa/drivers/dri/swrast/meson.build b/src/mesa/drivers/dri/swrast/meson.build
index 8580c0db7f5..0ae8b1ae6f7 100644
--- a/src/mesa/drivers/dri/swrast/meson.build
+++ b/src/mesa/drivers/dri/swrast/meson.build
@@ -23,5 +23,5 @@ libswrast_dri = static_library(
files('swrast.c', 'swrast_priv.h'),
gnu_symbol_visibility : 'hidden',
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_dri_common],
- dependencies : dep_libdrm,
+ dependencies : [dep_libdrm, idep_mesautil],
)
diff --git a/src/mesa/main/tests/meson.build b/src/mesa/main/tests/meson.build
index 4b39325154e..0e95fbfbbd0 100644
--- a/src/mesa/main/tests/meson.build
+++ b/src/mesa/main/tests/meson.build
@@ -39,7 +39,7 @@ test(
'main_test',
[files_main_test, main_dispatch_h],
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa],
- dependencies : [idep_gtest, dep_clock, dep_dl, dep_thread],
+ dependencies : [idep_gtest, dep_clock, dep_dl, dep_thread, idep_mesautil],
link_with : [libmesa_classic, link_main_test],
),
suite : ['mesa'],
diff --git a/src/mesa/state_tracker/tests/meson.build b/src/mesa/state_tracker/tests/meson.build
index 397c6b7d0d5..e62383976e4 100644
--- a/src/mesa/state_tracker/tests/meson.build
+++ b/src/mesa/state_tracker/tests/meson.build
@@ -22,7 +22,7 @@ libmesa_st_test_common = static_library(
'mesa_st_test_common',
['st_tests_common.cpp', ir_expression_operation_h],
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
- dependencies : idep_gtest,
+ dependencies : [idep_gtest, idep_mesautil],
)
test(
More information about the mesa-commit
mailing list