[PATCH xserver] meson: Use link_whole() not link_with(), for the Xorg dixmods.

Peter Hutterer peter.hutterer at who-t.net
Tue May 9 00:07:07 UTC 2017


On Mon, May 08, 2017 at 10:37:58AM -0700, Eric Anholt wrote:
> I clearly hadn't run ninja test, since fb no longer had any of the fb
> symbols in it.
> 
> Signed-off-by: Eric Anholt <eric at anholt.net>

woo, it works! :)

Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>

Cheers,
   Peter

> ---
>  hw/xfree86/dixmods/meson.build | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/hw/xfree86/dixmods/meson.build b/hw/xfree86/dixmods/meson.build
> index 39276dc32839..e4ffdba9333e 100644
> --- a/hw/xfree86/dixmods/meson.build
> +++ b/hw/xfree86/dixmods/meson.build
> @@ -18,7 +18,7 @@ shared_module(
>      include_directories: [inc, xorg_inc],
>      c_args: xorg_c_args,
>      dependencies: common_dep,
> -    link_with: libxserver_fb,
> +    link_whole: libxserver_fb,
>  
>      install: true,
>      install_dir: module_dir,
> @@ -31,7 +31,7 @@ shared_module(
>      include_directories: [inc, xorg_inc],
>      c_args: [ xorg_c_args, wfb_args ],
>      dependencies: common_dep,
> -    link_with: libxserver_wfb,
> +    link_whole: libxserver_wfb,
>  
>      install: true,
>      install_dir: module_dir,
> @@ -43,7 +43,7 @@ shared_module(
>      include_directories: [inc, xorg_inc],
>      c_args: xorg_c_args,
>      dependencies: common_dep,
> -    link_with: libxserver_miext_shadow,
> +    link_whole: libxserver_miext_shadow,
>  
>      install: true,
>      install_dir: module_dir,
> @@ -57,7 +57,7 @@ if build_glx
>          include_directories: [ inc, xorg_inc, glx_inc ],
>          c_args: [ xorg_c_args, glx_align64 ],
>          dependencies: [ common_dep, dl_dep ],
> -        link_with: libxserver_glx,
> +        link_whole: libxserver_glx,
>  
>          install: true,
>          install_dir: join_paths(module_dir, 'extensions')
> -- 
> 2.11.0
 


More information about the xorg-devel mailing list