Module: Mesa Branch: master Commit: a0a764cde5a0f469a1d3f04babb84268c26cf70c URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a0a764cde5a0f469a1d3f04babb84268c26cf70c
Author: Dylan Baker <[email protected]> Date: Tue Dec 12 12:25:34 2017 -0800 meson: move libsensors dependency to libgallium This simplifies the build by removing the need to link targets against libsensors. Suggested-by: Emil Velikov <[email protected]> Signed-off-by: Dylan Baker <[email protected]> Acked-by: Eric Engestrom <[email protected]> --- src/gallium/auxiliary/meson.build | 2 +- src/gallium/drivers/etnaviv/meson.build | 2 +- src/gallium/drivers/freedreno/meson.build | 1 - src/gallium/drivers/nouveau/meson.build | 2 +- src/gallium/drivers/r300/meson.build | 4 +--- src/gallium/targets/d3dadapter9/meson.build | 2 +- src/gallium/targets/dri/meson.build | 2 +- src/gallium/targets/libgl-xlib/meson.build | 5 +---- 8 files changed, 7 insertions(+), 13 deletions(-) diff --git a/src/gallium/auxiliary/meson.build b/src/gallium/auxiliary/meson.build index acef71bb3a..6f1542d7ad 100644 --- a/src/gallium/auxiliary/meson.build +++ b/src/gallium/auxiliary/meson.build @@ -497,7 +497,7 @@ libgallium = static_library( c_args : [c_vis_args, c_msvc_compat_args], cpp_args : [cpp_vis_args, cpp_msvc_compat_args], dependencies : [ - dep_libdrm, dep_llvm, dep_unwind, dep_dl, dep_m, dep_thread, + dep_libdrm, dep_llvm, dep_unwind, dep_dl, dep_m, dep_thread, dep_lmsensors, idep_nir_headers, ], build_by_default : false, diff --git a/src/gallium/drivers/etnaviv/meson.build b/src/gallium/drivers/etnaviv/meson.build index 0c7dbe29a7..2d091fbcbc 100644 --- a/src/gallium/drivers/etnaviv/meson.build +++ b/src/gallium/drivers/etnaviv/meson.build @@ -97,7 +97,7 @@ etnaviv_compiler = executable( 'etnaviv_compiler_cmdline.c', include_directories : [inc_include, inc_src, inc_gallium, inc_gallium_aux], link_with : [libmesa_util, libgallium, libetnaviv], - dependencies : [dep_libdrm_etnaviv, dep_lmsensors], + dependencies : [dep_libdrm_etnaviv], build_by_default : false, ) diff --git a/src/gallium/drivers/freedreno/meson.build b/src/gallium/drivers/freedreno/meson.build index 23c85cfa71..33a64d73aa 100644 --- a/src/gallium/drivers/freedreno/meson.build +++ b/src/gallium/drivers/freedreno/meson.build @@ -239,7 +239,6 @@ ir3_compiler = executable( dep_libdrm, dep_libdrm_freedreno, dep_thread, - dep_lmsensors, idep_nir, ], link_with : [ diff --git a/src/gallium/drivers/nouveau/meson.build b/src/gallium/drivers/nouveau/meson.build index 5d679e1c5a..8ddd865799 100644 --- a/src/gallium/drivers/nouveau/meson.build +++ b/src/gallium/drivers/nouveau/meson.build @@ -217,7 +217,7 @@ nouveau_compiler = executable( 'nouveau_compiler', 'nouveau_compiler.c', include_directories : [inc_src, inc_include, inc_gallium, inc_gallium_aux], - dependencies : [dep_libdrm, dep_libdrm_nouveau, dep_lmsensors], + dependencies : [dep_libdrm, dep_libdrm_nouveau], link_with : [libnouveau, libgallium, libmesa_util], build_by_default : false, ) diff --git a/src/gallium/drivers/r300/meson.build b/src/gallium/drivers/r300/meson.build index 698e4608de..d181048c51 100644 --- a/src/gallium/drivers/r300/meson.build +++ b/src/gallium/drivers/r300/meson.build @@ -157,9 +157,7 @@ if with_tests include_directories('compiler'), ], link_with : [libr300, libgallium, libmesa_util], - dependencies : [ - dep_m, dep_clock, dep_dl, dep_thread, dep_unwind, dep_lmsensors, - ], + dependencies : [dep_m, dep_clock, dep_dl, dep_thread, dep_unwind], ) ) endif diff --git a/src/gallium/targets/d3dadapter9/meson.build b/src/gallium/targets/d3dadapter9/meson.build index a04177c54c..27a8797221 100644 --- a/src/gallium/targets/d3dadapter9/meson.build +++ b/src/gallium/targets/d3dadapter9/meson.build @@ -64,7 +64,7 @@ libgallium_nine = shared_library( gallium_nine_link_with, ], dependencies : [ - dep_selinux, dep_expat, dep_libdrm, dep_llvm, dep_lmsensors, + dep_selinux, dep_expat, dep_libdrm, dep_llvm, driver_swrast, driver_r300, driver_r600, driver_radeonsi, driver_nouveau, driver_i915, driver_svga, ], diff --git a/src/gallium/targets/dri/meson.build b/src/gallium/targets/dri/meson.build index edf8d67fe3..30368c2152 100644 --- a/src/gallium/targets/dri/meson.build +++ b/src/gallium/targets/dri/meson.build @@ -66,7 +66,7 @@ libgallium_dri = shared_library( libpipe_loader_static, libws_null, libwsw, gallium_dri_link_with, ], dependencies : [ - dep_selinux, dep_expat, dep_libdrm, dep_llvm, dep_lmsensors, dep_thread, + dep_selinux, dep_expat, dep_libdrm, dep_llvm, dep_thread, driver_swrast, driver_r300, driver_r600, driver_radeonsi, driver_nouveau, driver_pl111, driver_vc4, driver_vc5, driver_freedreno, driver_etnaviv, driver_imx, driver_i915, driver_svga, driver_virgl, driver_swr, diff --git a/src/gallium/targets/libgl-xlib/meson.build b/src/gallium/targets/libgl-xlib/meson.build index 6c8d2b4bc0..6884c82620 100644 --- a/src/gallium/targets/libgl-xlib/meson.build +++ b/src/gallium/targets/libgl-xlib/meson.build @@ -53,10 +53,7 @@ libgl = shared_library( libxlib, libws_xlib, libtrace, librbug, libglapi_static, libgallium, libmesa_util, libmesa_gallium, gallium_xlib_link_with, ], - dependencies : [ - dep_thread, dep_clock, dep_unwind, dep_lmsensors, - driver_swrast, driver_swr, - ], + dependencies : [dep_thread, dep_clock, dep_unwind, driver_swrast, driver_swr], install : true, version : '1.5.0', ) _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
