meson: drop unused dep_{thread,dl}

Unused as of last commit.

Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
Acked-by: Eric Anholt <eric@anholt.net>
Tested-by: Vinson Lee <vlee@freedesktop.org>

diff --git a/src/compiler/glsl/meson.build b/src/compiler/glsl/meson.build
index ce6744eec66ad8da48defc3c6495420e21637bbb..3f5f2463e470ed89b17a2c1405d7e0a68bd66333 100644 (file)
--- 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 81ca02690032ec3a39f157182f720010ecc97c6b..108dc7eb10c1a39d41f57a4006818ccbb35ac58f 100644 (file)
--- 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 d1a021537b8fe556612ba86aab2e04ab6c14df20..0d5b00ba079df40fc625b7ff636d52a8729c101c 100644 (file)
--- 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 27e5ac001426d4f7722cd7e7b27f17c798ea04b0..36788ddf0dd03fb842d58806443548e257ea0f35 100644 (file)
--- 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 806839df19077f937033d4caa6464eb37ff8a2aa..6ad3017bf8d79ad50a4479ef285fcf3048892f35 100644 (file)
--- 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,
         ['@0@.c'.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 6fcafe5403402d07557708f729b3c5c14f19a359..66569bab36459f81c035a7ba05641cfa4f65f58f 100644 (file)
--- 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 6501daaa2d5c1abfe7211532bfdb5292b762e361..8b61ad7bcbf1614f9f69684caa1110f74cdb87b9 100644 (file)
--- 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 0a748106b5cb5dcba488874f41074a494292fec9..d35b06f7d8db5682bbeefc938cb6a5d7522e6eae 100644 (file)
--- 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 dd97c91b1f6747d23138cae92fe7bae944f45658..907cc74337dd3faf0eea8454406053417821d269 100644 (file)
--- 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 3240c66b648283a904edcd77472cc040db6ae7d4..ed8e0167a001db58d63b5c3fc18f00672af7a82a 100644 (file)
--- 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 3f001aaa5d05531c8d0f2091186b05b5ba2a8c3b..ed672e355ba2646c52ef8bec803821d21495fef6 100644 (file)
--- 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 2e334262bac3a1e78bb44e07717f77338405b739..6acb1c345996190070f6e797894d2c3ed3eb969d 100644 (file)
--- 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 e358c91e46ca7218b11d151f442403a9128a3a92..52f83024a548198b4141c009046364644fab4c90 100644 (file)
--- 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 f8ed2bce3bc4af0521a1e330f048b8f0eb79ae99..9a1f4e7db00d679030fb2883a3aebf0d62761d4e 100644 (file)
--- 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 7d8d430a7e28abe25bea875e789034cbdaae8aa9..bc6fbac47a9c97bfd8ad42e14e708ade67b3f15b 100644 (file)
--- a/src/gallium/tests/trivial/meson.build
+++ b/src/gallium/tests/trivial/meson.build
@@ -24,7 +24,7 @@ foreach t : ['compute', 'tri', 'quad-tex']
     '@0@.c'.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 75ad10852fc1b9dd52e260f3104d45d8a82d715b..d4f3aed08775b7ae0a44aa8022486e6133f2aacc 100644 (file)
--- 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',
     '@0@.c'.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 3d6a6de3853bb7bfb660a08ffd1d7e4578ed3ec3..37c9edcc3e141a918f394a98a5415a18bc50afa1 100644 (file)
--- 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 51bad505016f137b41de6316950603ceae65ed97..798163ecd2dd8f8943ac9f0d425f1ab5b4cc2822 100644 (file)
--- 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 d550f01c7fc9619e495cc435ec80f5c368ef1dac..5ef884cb1ceb14379592981325936349f30959ea 100644 (file)
--- 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 435c64d354adf2c3969fc2c00af851aeba5737e7..3d5bc6f04a6087b1d71ef0bab21e6ebd4bb55894 100644 (file)
--- 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 d3c186366fb3a811f99cc432a5220e291627dc67..be36c738bbb2da4724d6313071a56b8278648e18 100644 (file)
--- 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 2caeabd287d2620cbb35f7ff5a0b9a404ed56acb..2a341d181783035ea5d513cdb3acaa4841103a4d 100644 (file)
--- 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 58299b0ebf9850937f67a67ae12eb9a23158755e..a16407d5ea6c57dd61749af260bc3ccd1d56a43e 100644 (file)
--- 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 54b7774dd3a94679da9670e2f5d797764ca47a40..237d5a04a46d77de9b763d2b03bd51534e46452f 100644 (file)
--- 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('@0@.c'.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 9ab25179ec3ebee181dfa5f5c1d39dcbad443108..cb767bb317daae04a9f91aea1a8732295495f02b 100644 (file)
--- 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'],