summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Engestrom <[email protected]>2019-07-23 11:25:53 +0100
committerEric Engestrom <[email protected]>2019-08-03 00:08:37 +0000
commit178811d8f6a2a449069830b38d3feae0d34f962a (patch)
tree0aa2328d06cf2fecf30aa59f53ff71c2cb87adc3
parentd2d85b950d78c553b2694cda9ef0cc7bf9a0f737 (diff)
meson: drop unused dep_{thread,dl}
Unused as of last commit. Signed-off-by: Eric Engestrom <[email protected]> Acked-by: Eric Anholt <[email protected]> Tested-by: Vinson Lee <[email protected]>
-rw-r--r--src/compiler/glsl/meson.build2
-rw-r--r--src/compiler/meson.build2
-rw-r--r--src/gallium/drivers/freedreno/meson.build1
-rw-r--r--src/gallium/drivers/lima/meson.build1
-rw-r--r--src/gallium/drivers/llvmpipe/meson.build2
-rw-r--r--src/gallium/drivers/r300/meson.build2
-rw-r--r--src/gallium/targets/graw-xlib/meson.build2
-rw-r--r--src/gallium/targets/omx/meson.build2
-rw-r--r--src/gallium/targets/opencl/meson.build2
-rw-r--r--src/gallium/targets/va/meson.build2
-rw-r--r--src/gallium/targets/vdpau/meson.build2
-rw-r--r--src/gallium/targets/xa/meson.build2
-rw-r--r--src/gallium/targets/xvmc/meson.build2
-rw-r--r--src/gallium/tests/graw/meson.build2
-rw-r--r--src/gallium/tests/trivial/meson.build2
-rw-r--r--src/gallium/tests/unit/meson.build2
-rw-r--r--src/intel/common/meson.build2
-rw-r--r--src/intel/compiler/meson.build2
-rw-r--r--src/mesa/state_tracker/tests/meson.build8
-rw-r--r--src/panfrost/meson.build2
-rw-r--r--src/util/meson.build2
-rw-r--r--src/util/tests/fast_idiv_by_const/meson.build2
-rw-r--r--src/util/tests/fast_urem_by_const/meson.build2
-rw-r--r--src/util/tests/hash_table/meson.build2
-rw-r--r--src/util/tests/string_buffer/meson.build2
25 files changed, 25 insertions, 29 deletions
diff --git a/src/compiler/glsl/meson.build b/src/compiler/glsl/meson.build
index ce6744eec66..3f5f2463e47 100644
--- a/src/compiler/glsl/meson.build
+++ b/src/compiler/glsl/meson.build
@@ -241,7 +241,7 @@ libglsl_standalone = static_library(
cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
include_directories : [inc_common],
link_with : [libglsl, libglsl_util],
- dependencies : [dep_thread, idep_mesautil],
+ dependencies : idep_mesautil,
build_by_default : false,
)
diff --git a/src/compiler/meson.build b/src/compiler/meson.build
index 81ca0269003..108dc7eb10c 100644
--- a/src/compiler/meson.build
+++ b/src/compiler/meson.build
@@ -63,7 +63,7 @@ subdir('nir')
spirv2nir = executable(
'spirv2nir',
files('spirv/spirv2nir.c'),
- dependencies : [dep_m, dep_thread, idep_nir, idep_mesautil],
+ dependencies : [dep_m, idep_nir, idep_mesautil],
include_directories : [inc_common, inc_nir, include_directories('spirv')],
c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args],
build_by_default : with_tools.contains('nir'),
diff --git a/src/gallium/drivers/freedreno/meson.build b/src/gallium/drivers/freedreno/meson.build
index d1a021537b8..0d5b00ba079 100644
--- a/src/gallium/drivers/freedreno/meson.build
+++ b/src/gallium/drivers/freedreno/meson.build
@@ -254,7 +254,6 @@ ir3_compiler = executable(
'ir3/ir3_cmdline.c',
include_directories : freedreno_includes,
dependencies : [
- dep_thread,
idep_nir,
idep_mesautil,
],
diff --git a/src/gallium/drivers/lima/meson.build b/src/gallium/drivers/lima/meson.build
index 27e5ac00142..36788ddf0dd 100644
--- a/src/gallium/drivers/lima/meson.build
+++ b/src/gallium/drivers/lima/meson.build
@@ -97,7 +97,6 @@ lima_compiler = executable(
inc_src, inc_include, inc_gallium, inc_gallium_aux, inc_gallium_drivers, inc_mesa, inc_mapi, inc_compiler,
],
dependencies : [
- dep_thread,
idep_nir,
idep_mesautil,
],
diff --git a/src/gallium/drivers/llvmpipe/meson.build b/src/gallium/drivers/llvmpipe/meson.build
index 806839df190..6ad3017bf8d 100644
--- a/src/gallium/drivers/llvmpipe/meson.build
+++ b/src/gallium/drivers/llvmpipe/meson.build
@@ -116,7 +116,7 @@ if with_tests and with_gallium_softpipe and with_llvm
executable(
t,
['@[email protected]'.format(t), 'lp_test_main.c'],
- dependencies : [dep_llvm, dep_dl, dep_thread, dep_clock, idep_mesautil],
+ dependencies : [dep_llvm, dep_dl, dep_clock, idep_mesautil],
include_directories : [inc_gallium, inc_gallium_aux, inc_include, inc_src],
link_with : [libllvmpipe, libgallium],
),
diff --git a/src/gallium/drivers/r300/meson.build b/src/gallium/drivers/r300/meson.build
index 6fcafe54034..66569bab364 100644
--- a/src/gallium/drivers/r300/meson.build
+++ b/src/gallium/drivers/r300/meson.build
@@ -157,7 +157,7 @@ if with_tests
include_directories('compiler'),
],
link_with : [libr300, libgallium],
- dependencies : [dep_m, dep_clock, dep_dl, dep_thread, dep_unwind, idep_mesautil],
+ dependencies : [dep_m, dep_clock, dep_dl, dep_unwind, idep_mesautil],
),
suite : ['r300'],
)
diff --git a/src/gallium/targets/graw-xlib/meson.build b/src/gallium/targets/graw-xlib/meson.build
index 6501daaa2d5..8b61ad7bcbf 100644
--- a/src/gallium/targets/graw-xlib/meson.build
+++ b/src/gallium/targets/graw-xlib/meson.build
@@ -25,7 +25,7 @@ libgraw_xlib = shared_library(
link_with : [
libgraw_util, libgallium, libws_xlib
],
- dependencies : [idep_mesautil, dep_thread, driver_swrast],
+ dependencies : [idep_mesautil, driver_swrast],
version : '1.0',
)
diff --git a/src/gallium/targets/omx/meson.build b/src/gallium/targets/omx/meson.build
index 0a748106b5c..d35b06f7d8d 100644
--- a/src/gallium/targets/omx/meson.build
+++ b/src/gallium/targets/omx/meson.build
@@ -45,7 +45,7 @@ libomx_gallium = shared_library(
libpipe_loader_static, libws_null, libwsw, libswdri, libswkmsdri,
],
link_depends : omx_link_depends,
- dependencies : [dep_thread, idep_mesautil, driver_r600, driver_radeonsi, driver_nouveau],
+ dependencies : [idep_mesautil, driver_r600, driver_radeonsi, driver_nouveau],
install : true,
install_dir : omx_drivers_path,
)
diff --git a/src/gallium/targets/opencl/meson.build b/src/gallium/targets/opencl/meson.build
index dd97c91b1f6..907cc74337d 100644
--- a/src/gallium/targets/opencl/meson.build
+++ b/src/gallium/targets/opencl/meson.build
@@ -42,7 +42,7 @@ libopencl = shared_library(
link_with : [libpipe_loader_dynamic, libgallium],
dependencies : [
idep_mesautil,
- dep_thread, dep_clock, dep_dl, dep_unwind, dep_elf, dep_expat,
+ dep_clock, dep_dl, dep_unwind, dep_elf,
cpp.find_library('clangCodeGen', dirs : llvm_libdir),
cpp.find_library('clangFrontendTool', dirs : llvm_libdir),
cpp.find_library('clangFrontend', dirs : llvm_libdir),
diff --git a/src/gallium/targets/va/meson.build b/src/gallium/targets/va/meson.build
index 3240c66b648..ed8e0167a00 100644
--- a/src/gallium/targets/va/meson.build
+++ b/src/gallium/targets/va/meson.build
@@ -46,7 +46,7 @@ libva_gallium = shared_library(
libpipe_loader_static, libws_null, libwsw, libswdri, libswkmsdri,
],
dependencies : [
- dep_libdrm, dep_thread, driver_r600, driver_radeonsi, driver_nouveau,
+ dep_libdrm, driver_r600, driver_radeonsi, driver_nouveau,
idep_mesautil,
],
link_depends : va_link_depends,
diff --git a/src/gallium/targets/vdpau/meson.build b/src/gallium/targets/vdpau/meson.build
index 3f001aaa5d0..ed672e355ba 100644
--- a/src/gallium/targets/vdpau/meson.build
+++ b/src/gallium/targets/vdpau/meson.build
@@ -51,7 +51,7 @@ libvdpau_gallium = shared_library(
libpipe_loader_static, libws_null, libwsw, libswdri, libswkmsdri,
],
dependencies : [
- dep_thread, idep_mesautil,
+ idep_mesautil,
driver_r300, driver_r600, driver_radeonsi, driver_nouveau,
],
link_depends : vdpau_link_depends,
diff --git a/src/gallium/targets/xa/meson.build b/src/gallium/targets/xa/meson.build
index 2e334262bac..6acb1c34599 100644
--- a/src/gallium/targets/xa/meson.build
+++ b/src/gallium/targets/xa/meson.build
@@ -48,7 +48,7 @@ libxatracker = shared_library(
],
link_depends : xa_link_depends,
dependencies : [
- dep_thread, idep_mesautil,
+ idep_mesautil,
driver_nouveau, driver_i915, driver_svga, driver_freedreno,
],
version : _xa_version,
diff --git a/src/gallium/targets/xvmc/meson.build b/src/gallium/targets/xvmc/meson.build
index e358c91e46c..52f83024a54 100644
--- a/src/gallium/targets/xvmc/meson.build
+++ b/src/gallium/targets/xvmc/meson.build
@@ -45,7 +45,7 @@ libxvmc_gallium = shared_library(
libgalliumvlwinsys, libgalliumvl, libgallium,
libpipe_loader_static, libws_null, libwsw, libswdri, libswkmsdri,
],
- dependencies : [dep_thread, idep_mesautil, driver_r600, driver_nouveau],
+ dependencies : [idep_mesautil, driver_r600, driver_nouveau],
link_depends : xvmc_link_depends,
# Will be deleted during installation, see install_megadrivers.py
install : true,
diff --git a/src/gallium/tests/graw/meson.build b/src/gallium/tests/graw/meson.build
index f8ed2bce3bc..9a1f4e7db00 100644
--- a/src/gallium/tests/graw/meson.build
+++ b/src/gallium/tests/graw/meson.build
@@ -31,6 +31,6 @@ foreach t : progs
t + '.c',
include_directories : inc_common,
link_with : [libgraw, libgraw_util, libgallium],
- dependencies : [dep_m, dep_thread, idep_mesautil],
+ dependencies : [dep_m, idep_mesautil],
)
endforeach
diff --git a/src/gallium/tests/trivial/meson.build b/src/gallium/tests/trivial/meson.build
index 7d8d430a7e2..bc6fbac47a9 100644
--- a/src/gallium/tests/trivial/meson.build
+++ b/src/gallium/tests/trivial/meson.build
@@ -24,7 +24,7 @@ foreach t : ['compute', 'tri', 'quad-tex']
'@[email protected]'.format(t),
include_directories : inc_common,
link_with : [libgallium, libpipe_loader_dynamic],
- dependencies : [idep_mesautil, dep_thread],
+ dependencies : idep_mesautil,
install : false,
)
endforeach
diff --git a/src/gallium/tests/unit/meson.build b/src/gallium/tests/unit/meson.build
index 75ad10852fc..d4f3aed0877 100644
--- a/src/gallium/tests/unit/meson.build
+++ b/src/gallium/tests/unit/meson.build
@@ -25,7 +25,7 @@ foreach t : ['pipe_barrier_test', 'u_cache_test', 'u_half_test',
'@[email protected]'.format(t),
include_directories : inc_common,
link_with : libgallium,
- dependencies : [idep_mesautil, dep_thread],
+ dependencies : idep_mesautil,
install : false,
)
# u_cache_test is slow, and translate_test fails.
diff --git a/src/intel/common/meson.build b/src/intel/common/meson.build
index 3d6a6de3853..37c9edcc3e1 100644
--- a/src/intel/common/meson.build
+++ b/src/intel/common/meson.build
@@ -59,7 +59,7 @@ if install_intel_gpu_tests
],
include_directories : [inc_common, inc_intel],
link_with : [libintel_dev],
- dependencies : [dep_libdrm, dep_thread, idep_gtest, idep_genxml, idep_mesautil],
+ dependencies : [dep_libdrm, idep_gtest, idep_genxml, idep_mesautil],
install : install_intel_gpu_tests,
)
endforeach
diff --git a/src/intel/compiler/meson.build b/src/intel/compiler/meson.build
index 51bad505016..798163ecd2d 100644
--- a/src/intel/compiler/meson.build
+++ b/src/intel/compiler/meson.build
@@ -157,7 +157,7 @@ if with_tests
link_with : [
libintel_compiler, libintel_common, libintel_dev, libisl,
],
- dependencies : [dep_thread, dep_dl, idep_gtest, idep_nir, idep_mesautil],
+ dependencies : [idep_gtest, idep_nir, idep_mesautil],
),
suite : ['intel'],
)
diff --git a/src/mesa/state_tracker/tests/meson.build b/src/mesa/state_tracker/tests/meson.build
index d550f01c7fc..5ef884cb1ce 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_common,
- dependencies : [dep_thread, idep_gtest],
+ dependencies : idep_gtest,
)
test(
@@ -34,7 +34,7 @@ test(
link_with : [
libmesa_st_test_common, libmesa_gallium, libglapi, libgallium,
],
- dependencies : [dep_thread, idep_mesautil],
+ dependencies : idep_mesautil,
),
suite : ['st_mesa'],
)
@@ -48,7 +48,7 @@ test(
link_with : [
libmesa_st_test_common, libmesa_gallium, libglapi, libgallium,
],
- dependencies : [idep_mesautil, idep_gtest, dep_thread],
+ dependencies : [idep_mesautil, idep_gtest],
),
suite : ['st_mesa'],
)
@@ -62,7 +62,7 @@ test(
link_with : [
libmesa_st_test_common, libmesa_gallium, libglapi, libgallium,
],
- dependencies : [idep_mesautil, idep_gtest, dep_thread],
+ dependencies : [idep_mesautil, idep_gtest],
),
suite : ['st_mesa'],
)
diff --git a/src/panfrost/meson.build b/src/panfrost/meson.build
index 435c64d354a..3d5bc6f04a6 100644
--- a/src/panfrost/meson.build
+++ b/src/panfrost/meson.build
@@ -48,7 +48,6 @@ pandecode = executable(
files_pandecode,
include_directories : [inc_common, inc_include, inc_src, inc_panfrost],
dependencies : [
- dep_thread,
idep_mesautil,
],
build_by_default : true
@@ -68,7 +67,6 @@ bifrost_compiler = executable(
inc_panfrost,
],
dependencies : [
- dep_thread,
idep_nir,
idep_mesautil,
],
diff --git a/src/util/meson.build b/src/util/meson.build
index d3c186366fb..be36c738bbb 100644
--- a/src/util/meson.build
+++ b/src/util/meson.build
@@ -214,7 +214,7 @@ if with_tests
'bitset_test',
files('bitset_test.cpp'),
include_directories : inc_common,
- dependencies : [idep_mesautil, dep_thread, dep_dl, idep_gtest],
+ dependencies : [idep_mesautil, idep_gtest],
),
suite : ['util'],
)
diff --git a/src/util/tests/fast_idiv_by_const/meson.build b/src/util/tests/fast_idiv_by_const/meson.build
index 2caeabd287d..2a341d18178 100644
--- a/src/util/tests/fast_idiv_by_const/meson.build
+++ b/src/util/tests/fast_idiv_by_const/meson.build
@@ -23,7 +23,7 @@ test(
executable(
'fast_idiv_by_const_test',
'fast_idiv_by_const_test.cpp',
- dependencies : [dep_thread, dep_dl, idep_gtest, idep_mesautil],
+ dependencies : [idep_gtest, idep_mesautil],
include_directories : inc_common,
),
suite : ['util'],
diff --git a/src/util/tests/fast_urem_by_const/meson.build b/src/util/tests/fast_urem_by_const/meson.build
index 58299b0ebf9..a16407d5ea6 100644
--- a/src/util/tests/fast_urem_by_const/meson.build
+++ b/src/util/tests/fast_urem_by_const/meson.build
@@ -24,7 +24,7 @@ test(
executable(
'fast_urem_by_const_test',
'fast_urem_by_const_test.cpp',
- dependencies : [dep_thread, dep_dl, idep_gtest, idep_mesautil],
+ dependencies : [idep_gtest, idep_mesautil],
include_directories : inc_common,
),
suite : ['util'],
diff --git a/src/util/tests/hash_table/meson.build b/src/util/tests/hash_table/meson.build
index 54b7774dd3a..237d5a04a46 100644
--- a/src/util/tests/hash_table/meson.build
+++ b/src/util/tests/hash_table/meson.build
@@ -28,7 +28,7 @@ foreach t : ['clear', 'collision', 'delete_and_lookup', 'delete_management',
'@0@_test'.format(t),
files('@[email protected]'.format(t)),
c_args : [c_msvc_compat_args],
- dependencies : [dep_thread, dep_dl, idep_mesautil],
+ dependencies : idep_mesautil,
include_directories : [inc_include, inc_util],
),
suite : ['util'],
diff --git a/src/util/tests/string_buffer/meson.build b/src/util/tests/string_buffer/meson.build
index 9ab25179ec3..cb767bb317d 100644
--- a/src/util/tests/string_buffer/meson.build
+++ b/src/util/tests/string_buffer/meson.build
@@ -23,7 +23,7 @@ test(
executable(
'string_buffer_test',
'string_buffer_test.cpp',
- dependencies : [dep_thread, dep_dl, idep_gtest, idep_mesautil],
+ dependencies : [idep_gtest, idep_mesautil],
include_directories : inc_common,
),
suite : ['util'],