diff options
author | Dylan Baker <[email protected]> | 2017-12-12 12:25:34 -0800 |
---|---|---|
committer | Dylan Baker <[email protected]> | 2018-01-11 15:40:02 -0800 |
commit | a0a764cde5a0f469a1d3f04babb84268c26cf70c (patch) | |
tree | 8451ad1f958ded0686e3f1404e82863ec6068e00 /src/gallium/drivers | |
parent | 2083a14179eb04d22feebc5751a1a145828d07cf (diff) |
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]>
Diffstat (limited to 'src/gallium/drivers')
-rw-r--r-- | src/gallium/drivers/etnaviv/meson.build | 2 | ||||
-rw-r--r-- | src/gallium/drivers/freedreno/meson.build | 1 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/meson.build | 2 | ||||
-rw-r--r-- | src/gallium/drivers/r300/meson.build | 4 |
4 files changed, 3 insertions, 6 deletions
diff --git a/src/gallium/drivers/etnaviv/meson.build b/src/gallium/drivers/etnaviv/meson.build index 0c7dbe29a74..2d091fbcbc2 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 23c85cfa71b..33a64d73aa4 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 5d679e1c5a6..8ddd8657991 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 698e4608ded..d181048c51d 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 |