From 38b2402b5f6cf9b37bdfffde23ff5fdff1afdcb3 Mon Sep 17 00:00:00 2001 From: Yonggang Luo Date: Fri, 4 Nov 2022 09:57:22 +0800 Subject: [PATCH] meson: Use deps_for_libmesa_util for idep_mesautil instead hand crafted list Now the idep_mesautilc11 have no need reference when idep_mesautil is referenced Signed-off-by: Yonggang Luo Reviewed-by: Dylan Baker Part-of: --- src/mapi/glapi/meson.build | 4 ++-- src/mapi/shared-glapi/meson.build | 2 +- src/util/meson.build | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mapi/glapi/meson.build b/src/mapi/glapi/meson.build index c14c28b1f26..eab9882a1cc 100644 --- a/src/mapi/glapi/meson.build +++ b/src/mapi/glapi/meson.build @@ -81,7 +81,7 @@ libglapi_bridge = static_library( bridge_glapi_files, include_directories : [inc_mesa, inc_include, inc_src, inc_mapi], c_args : [c_msvc_compat_args, bridge_glapi_args], - dependencies : [dep_thread, dep_selinux, idep_mesautilc11, idep_mesautil], + dependencies : [dep_thread, dep_selinux, idep_mesautil], build_by_default : false, ) @@ -93,7 +93,7 @@ else static_glapi_files, include_directories : [inc_mesa, inc_include, inc_src, inc_mapi], c_args : [c_msvc_compat_args, static_glapi_args], - dependencies : [dep_thread, dep_selinux, idep_mesautilc11, idep_mesautil], + dependencies : [dep_thread, dep_selinux, idep_mesautil], build_by_default : false, ) endif diff --git a/src/mapi/shared-glapi/meson.build b/src/mapi/shared-glapi/meson.build index 3db5646c7f4..0b5597e0913 100644 --- a/src/mapi/shared-glapi/meson.build +++ b/src/mapi/shared-glapi/meson.build @@ -54,7 +54,7 @@ libglapi = shared_library( gnu_symbol_visibility : 'hidden', link_args : [ld_args_gc_sections], include_directories : [inc_src, inc_include, inc_mapi], - dependencies : [dep_thread, dep_selinux, idep_mesautilc11, idep_mesautil], + dependencies : [dep_thread, dep_selinux, idep_mesautil], soversion : host_machine.system() == 'windows' ? '' : '0', version : '0.0.0', name_prefix : 'lib', diff --git a/src/util/meson.build b/src/util/meson.build index 6637b386ef5..c8aeddd6fe4 100644 --- a/src/util/meson.build +++ b/src/util/meson.build @@ -280,7 +280,7 @@ _libmesa_util = static_library( idep_mesautil = declare_dependency( link_with : _libmesa_util, include_directories : [inc_util, inc_gallium], - dependencies : [dep_zlib, dep_clock, dep_thread, dep_atomic, dep_m, dep_valgrind, dep_futex], + dependencies : deps_for_libmesa_util, ) xmlconfig_deps = []