libweston,shared/meson:build Add xkbcommon missing depends
This is because e619a65b091, 'libweston: move gl-borders code into helper lib' and 6293ab1f90fdaf, 'libweston, shared: Move out weston_shell_get_binding_modifier' moved things out of libweston, and libweston implicitly depends on xkbcommon. Rather than just depending on dep_xkbcommon use the deps_for_libweston_users which includes some other dependencies as well. Had to move it out of libweston/meson.build and include it in the main meson.build as libweston/meson.build would have a circular dependency on libweston/meson.build file. This fixes the following build issue: [ 5s] FAILED: libweston/libgl-borders.a.p/gl-borders.c.o [ 5s] cc -Ilibweston/libgl-borders.a.p -Ilibweston -I../libweston -I. -I.. -Iinclude -I../include -I/usr/include/wayland -I/usr/include/pixman-1 -I/usr/include/cairo -I/usr/include/libpng16 -I/usr/include/freetype2 -I/usr/include/webp -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -Wpedantic -std=gnu99 -Wmissing-prototypes -Wno-unused-parameter -Wno-shift-negative-value -Wno-missing-field-initializers -Wno-pedantic -Wundef -fvisibility=hidden -O2 -Wall -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -Werror=return-type -flto=auto -g -fPIC -MD -MQ libweston/libgl-borders.a.p/gl-borders.c.o -MF libweston/libgl-borders.a.p/gl-borders.c.o.d -o libweston/libgl-borders.a.p/gl-borders.c.o -c ../libweston/gl-borders.c [ 5s] In file included from ../libweston/renderer-gl/gl-renderer.h:32, [ 5s] from ../libweston/gl-borders.h:28, [ 5s] from ../libweston/gl-borders.c:31: [ 5s] ../include/libweston/libweston.h:39:10: fatal error: xkbcommon/xkbcommon.h: No such file or directory [ 4s] FAILED: shared/libshared.a.p/config-parser.c.o [ 4s] cc -Ishared/libshared.a.p -Ishared -I../shared -I. -I.. -Iinclude -I../include -I/usr/include/wayland -I/usr/include/pixman-1 -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -Wpedantic -std=gnu99 -Wmissing-prototypes -Wno-unused-parameter -Wno-shift-negative-value -Wno-missing-field-initializers -Wno-pedantic -Wundef -fvisibility=hidden -O2 -Wall -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -Werror=return-type -flto=auto -g -fPIC -MD -MQ shared/libshared.a.p/config-parser.c.o -MF shared/libshared.a.p/config-parser.c.o.d -o shared/libshared.a.p/config-parser.c.o -c ../shared/config-parser.c [ 4s] In file included from ../shared/config-parser.c:44: [ 4s] ../include/libweston/libweston.h:39:10: fatal error: xkbcommon/xkbcommon.h: No such file or directory Reported-by: Jan Engelhardt <jengelh@inai.de> Signed-off-by: Jan Engelhardt <jengelh@inai.de> Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
This commit is contained in:
parent
933f362cec
commit
e1c4133836
@ -112,11 +112,6 @@ lib_weston = shared_library(
|
||||
dependencies: deps_libweston
|
||||
)
|
||||
|
||||
deps_for_libweston_users = [
|
||||
dep_wayland_server,
|
||||
dep_pixman,
|
||||
dep_xkbcommon,
|
||||
]
|
||||
|
||||
# For external users, like Weston.
|
||||
dep_libweston_public = declare_dependency(
|
||||
@ -255,6 +250,7 @@ lib_gl_borders = static_library(
|
||||
dependencies: [
|
||||
dep_lib_cairo_shared,
|
||||
dep_egl, # for gl-renderer.h
|
||||
deps_for_libweston_users,
|
||||
],
|
||||
build_by_default: false,
|
||||
install: false
|
||||
|
@ -153,6 +153,13 @@ prog_python = import('python').find_installation('python3')
|
||||
files_xxd_py = files('tools/xxd.py')
|
||||
cmd_xxd = [ prog_python, files_xxd_py, '@INPUT@', '@OUTPUT@' ]
|
||||
|
||||
deps_for_libweston_users = [
|
||||
dep_wayland_server,
|
||||
dep_pixman,
|
||||
dep_xkbcommon,
|
||||
]
|
||||
|
||||
|
||||
subdir('include')
|
||||
subdir('protocol')
|
||||
subdir('shared')
|
||||
|
@ -7,7 +7,8 @@ srcs_libshared = [
|
||||
'process-util.c',
|
||||
'hash.c',
|
||||
]
|
||||
deps_libshared = [dep_wayland_client, dep_wayland_server, dep_pixman]
|
||||
deps_libshared = [dep_wayland_client, dep_wayland_server,
|
||||
dep_pixman, deps_for_libweston_users]
|
||||
|
||||
lib_libshared = static_library(
|
||||
'shared',
|
||||
|
Loading…
x
Reference in New Issue
Block a user