[PATCH libinput] meson: swap libinput dependencies
Michel Dänzer
michel at daenzer.net
Mon Jun 26 04:01:45 UTC 2017
On 23/06/17 02:23 PM, Peter Hutterer wrote:
> Since meson commit ae9b238 "ninja: De-dup libraries and use --start/end-group"
> we get linker errors with the tools. The duplication is apparently a bit too
> agressive, swapping the order here make sure libinput isn't removed.
>
> Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
> Reported-by: Michel Dänzer <michel at daenzer.net>
> ---
> meson.build | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meson.build b/meson.build
> index e77f7d13..e122dd97 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -357,7 +357,7 @@ lib_tools_shared = static_library('tools_shared',
> dep_tools_shared = declare_dependency(link_with : lib_tools_shared,
> dependencies : deps_tools_shared)
>
> -deps_tools = [ dep_libinput, dep_tools_shared ]
> +deps_tools = [ dep_tools_shared, dep_libinput ]
> libinput_debug_events_sources = [ 'tools/libinput-debug-events.c' ]
> executable('libinput-debug-events',
> libinput_debug_events_sources,
>
Fixes the build failure with meson 0.41.y for me.
Tested-by: Michel Dänzer <michel.daenzer at amd.com>
--
Earthling Michel Dänzer | http://www.amd.com
Libre software enthusiast | Mesa and X developer
More information about the wayland-devel
mailing list