[PATCH libinput] meson: swap libinput dependencies

Peter Hutterer peter.hutterer at who-t.net
Fri Jun 23 05:23:08 UTC 2017


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



More information about the wayland-devel mailing list