KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

meson: move libsensors dependency to libgallium 

This simplifies the build by removing the need to link targets against
libsensors.

Suggested-by: Emil Velikov <emil.velikov@collabora.com>
Signed-off-by: Dylan Baker <dylan.c.baker@intel.com>
Acked-by: Eric Engestrom <eric.engestrom@imgtec.com>
This commit is contained in:
Dylan Baker 2017-12-12 12:25:34 -08:00
parent 2083a14179
commit a0a764cde5
8 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gallium/auxiliary/meson.build
View File

@ -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,

2
src/gallium/drivers/etnaviv/meson.build
View File

@ -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,
)

1
src/gallium/drivers/freedreno/meson.build
View File

@ -239,7 +239,6 @@ ir3_compiler = executable(
dep_libdrm,
dep_libdrm_freedreno,
dep_thread,
dep_lmsensors,
idep_nir,
],
link_with : [

2
src/gallium/drivers/nouveau/meson.build
View File

@ -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,
)

4
src/gallium/drivers/r300/meson.build
View File

@ -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

2
src/gallium/targets/d3dadapter9/meson.build
View File

@ -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,
],

2
src/gallium/targets/dri/meson.build
View File

@ -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,

5
src/gallium/targets/libgl-xlib/meson.build
View File

@ -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',
)