[Mesa-dev] [PATCH mesa] meson: add dep_thread to every lib that includes threads.h

[Dylan Baker]

Reviewed-by: Dylan Baker <dylan at pnwbakers.com>

Quoting Eric Engestrom (2017-12-07 06:51:41)
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104141
> Signed-off-by: Eric Engestrom <eric.engestrom at imgtec.com>
> ---
>  src/broadcom/meson.build                    | 2 +-
>  src/gallium/auxiliary/meson.build           | 2 +-
>  src/gallium/state_trackers/nine/meson.build | 1 +
>  src/gallium/targets/xa/meson.build          | 2 +-
>  src/gallium/targets/xvmc/meson.build        | 2 +-
>  src/gbm/meson.build                         | 2 +-
>  src/intel/common/meson.build                | 2 +-
>  src/loader/meson.build                      | 2 +-
>  src/util/meson.build                        | 2 +-
>  9 files changed, 9 insertions(+), 8 deletions(-)
> 
> diff --git a/src/broadcom/meson.build b/src/broadcom/meson.build
> index dbeee091139dcd05ec5a..6072fd1b997bb29b307a 100644
> --- a/src/broadcom/meson.build
> +++ b/src/broadcom/meson.build
> @@ -39,6 +39,6 @@ if with_gallium_vc5
>      c_args : [c_vis_args, no_override_init_args],
>      link_whole : [libbroadcom_compiler, libbroadcom_qpu],
>      build_by_default : false,
> -    dependencies: dep_valgrind,
> +    dependencies: [dep_valgrind, dep_thread],
>    )
>  endif
> diff --git a/src/gallium/auxiliary/meson.build b/src/gallium/auxiliary/meson.build
> index 3e623fd099fe4b60a5de..4d59f07fd31f3a154934 100644
> --- a/src/gallium/auxiliary/meson.build
> +++ b/src/gallium/auxiliary/meson.build
> @@ -495,7 +495,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],
> +  dependencies : [dep_libdrm, dep_llvm, dep_unwind, dep_dl, dep_m, dep_thread],
>    build_by_default : false,
>  )
>  
> diff --git a/src/gallium/state_trackers/nine/meson.build b/src/gallium/state_trackers/nine/meson.build
> index 797ef389a69f164d7440..491b7937ab19d754e498 100644
> --- a/src/gallium/state_trackers/nine/meson.build
> +++ b/src/gallium/state_trackers/nine/meson.build
> @@ -66,4 +66,5 @@ libnine_st = static_library(
>    include_directories : [
>      inc_d3d9, inc_gallium, inc_include, inc_src, inc_gallium_aux,
>    ],
> +  dependencies : dep_thread,
>  )
> diff --git a/src/gallium/targets/xa/meson.build b/src/gallium/targets/xa/meson.build
> index f16921dfc9c443a166b4..f25999d1603c2873897a 100644
> --- a/src/gallium/targets/xa/meson.build
> +++ b/src/gallium/targets/xa/meson.build
> @@ -45,7 +45,7 @@ libxatracker = shared_library(
>    ],
>    link_depends : xa_link_depends,
>    dependencies : [
> -    dep_xcb, dep_x11_xcb, dep_xcb_dri2, dep_xcb_dri3, dep_libdrm,
> +    dep_xcb, dep_x11_xcb, dep_xcb_dri2, dep_xcb_dri3, dep_libdrm, dep_thread,
>      driver_nouveau, driver_i915, driver_svga, driver_freedreno,
>    ],
>    install : true,
> diff --git a/src/gallium/targets/xvmc/meson.build b/src/gallium/targets/xvmc/meson.build
> index 76de816efed7559602a3..48759de910f88e66b82b 100644
> --- a/src/gallium/targets/xvmc/meson.build
> +++ b/src/gallium/targets/xvmc/meson.build
> @@ -45,7 +45,7 @@ libxvmc_gallium = shared_library(
>      libpipe_loader_static, libws_null, libwsw,
>    ],
>    dependencies : [
> -    dep_xcb, dep_x11_xcb, dep_xcb_dri2, dep_xcb_dri3, dep_libdrm,
> +    dep_xcb, dep_x11_xcb, dep_xcb_dri2, dep_xcb_dri3, dep_libdrm, dep_thread,
>      driver_r600, driver_nouveau,
>    ],
>    link_depends : xvmc_link_depends,
> diff --git a/src/gbm/meson.build b/src/gbm/meson.build
> index 4b550e06f2790ae9a13d..6e512996add1cfadd189 100644
> --- a/src/gbm/meson.build
> +++ b/src/gbm/meson.build
> @@ -54,7 +54,7 @@ libgbm = shared_library(
>    c_args : [c_vis_args, args_gbm],
>    link_args : [ld_args_gc_sections],
>    link_with : [libloader, libmesa_util, libxmlconfig],
> -  dependencies : [deps_gbm, dep_dl],
> +  dependencies : [deps_gbm, dep_dl, dep_thread],
>    version : '1.0.0',
>    install : true,
>  )
> diff --git a/src/intel/common/meson.build b/src/intel/common/meson.build
> index cbcf6647531193142cd5..19472e306f4577ebc231 100644
> --- a/src/intel/common/meson.build
> +++ b/src/intel/common/meson.build
> @@ -40,5 +40,5 @@ libintel_common = static_library(
>    files_libintel_common,
>    include_directories : [inc_common, inc_intel],
>    c_args : [c_vis_args, no_override_init_args],
> -  dependencies : [dep_expat, dep_libdrm],
> +  dependencies : [dep_expat, dep_libdrm, dep_thread],
>  )
> diff --git a/src/loader/meson.build b/src/loader/meson.build
> index 05268f58f3f138fe0eb0..e4455e9a72b24891f58b 100644
> --- a/src/loader/meson.build
> +++ b/src/loader/meson.build
> @@ -41,6 +41,6 @@ libloader = static_library(
>     xmlpool_options_h],
>    c_args : [c_vis_args, '-DUSE_DRICONF'],
>    include_directories : [inc_include, inc_src, inc_util],
> -  dependencies : dep_libdrm,
> +  dependencies : [dep_libdrm, dep_thread],
>    build_by_default : false,
>  )
> diff --git a/src/util/meson.build b/src/util/meson.build
> index b54c20796ff01012759b..225593f5d381b486bdb2 100644
> --- a/src/util/meson.build
> +++ b/src/util/meson.build
> @@ -102,7 +102,7 @@ libmesa_util = static_library(
>    'mesa_util',
>    [files_mesa_util, format_srgb],
>    include_directories : inc_common,
> -  dependencies : [dep_zlib, dep_clock],
> +  dependencies : [dep_zlib, dep_clock, dep_thread],
>    c_args : [c_msvc_compat_args, c_vis_args],
>    build_by_default : false
>  )
> -- 
> Cheers,
>   Eric
> 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: signature
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20171207/5b889b61/attachment.sig>