diff options
| author | Antonio Alvarez Feijoo <antonio.feijoo@suse.com> | 2021-09-15 08:46:40 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2021-10-12 16:59:58 +0200 |
| commit | 9d6a6c8a104122cb41667fb1e1e67731838b51cf (patch) | |
| tree | f443d7d4a182160bc8284e7fb0304edf46116d43 /meson.build | |
| parent | 0062322638aa36df8190326a6afd38780fb7a271 (diff) | |
| download | systemd-9d6a6c8a104122cb41667fb1e1e67731838b51cf.tar.gz | |
meson: add missing include directory when using xkbcommon
Otherwise the build fails:
FAILED: systemd-localed.p/src_locale_localed.c.o
cc -Isystemd-localed.p -I. -I.. -Isrc/basic -I../src/basic -Isrc/fundamental -I../src/fundamental -Isrc/systemd -I../src/systemd -I../src/libsystemd/sd-bus -I../src/libsystemd/sd-device -I../src/libsystemd/sd-event -I../src/libsystemd/sd-hwdb -I../src/libsystemd/sd-id128 -I../src/libsystemd/sd-journal -I../src/libsystemd/sd-netlink -I../src/libsystemd/sd-network -I../src/libsystemd/sd-resolve -Isrc/shared -I../src/shared -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -std=gnu99 -g -Wno-format-signedness -Wno-missing-field-initializers -Wno-unused-parameter -Wdate-time -Wendif-labels -Werror=format=2 -Werror=implicit-function-declaration -Werror=incompatible-pointer-types -Werror=overflow -Werror=return-type -Werror=shift-count-overflow -Werror=shift-overflow=2 -Werror=undef -Werror=unused-function -Wfloat-equal -Wimplicit-fallthrough=5 -Winit-self -Wlogical-op -Wmissing-include-dirs -Wmissing-noreturn -Wnested-externs -Wold-style-definition -Wpointer-arith -Wredundant-decls -Wshadow -Wstrict-aliasing=2 -Wstrict-prototypes -Wsuggest-attribute=noreturn -Wwrite-strings -Wno-unused-result -Werror=missing-declarations -Werror=missing-prototypes -fdiagnostics-show-option -ffast-math -fno-common -fno-strict-aliasing -fstack-protector -fstack-protector-strong -fvisibility=hidden --param=ssp-buffer-size=4 -Werror=shadow -include config.h -MD -MQ systemd-localed.p/src_locale_localed.c.o -MF systemd-localed.p/src_locale_localed.c.o.d -o systemd-localed.p/src_locale_localed.c.o -c ../src/locale/localed.c
../src/locale/localed.c:9:10: fatal error: xkbcommon/xkbcommon.h: No such file or directory
9 | #include <xkbcommon/xkbcommon.h>
| ^~~~~~~~~~~~~~~~~~~~~~~
compilation terminated.
(cherry picked from commit aff870ef61bda152ea6241f684dcab26a9265e78)
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/meson.build b/meson.build index 35076079dd..b5a51b6d0d 100644 --- a/meson.build +++ b/meson.build @@ -2495,14 +2495,16 @@ if conf.get('ENABLE_LOCALED') == 1 if conf.get('HAVE_XKBCOMMON') == 1 # logind will load libxkbcommon.so dynamically on its own deps = [libdl] + extra_includes = [libxkbcommon.get_pkgconfig_variable('includedir')] else deps = [] + extra_includes = [] endif executable( 'systemd-localed', systemd_localed_sources, - include_directories : includes, + include_directories : includes + extra_includes, link_with : [libshared], dependencies : deps, install_rpath : rootlibexecdir, |