Skip to content

Commit a25979d

Browse files
bobolopolisRaphael Kubo da Costa
authored andcommitted
chromium-x11: Add missing DEPENDS on libxkbcommon
When using a distro without "wayland" in DISTRO_FEATURES, the build fails due to libxkbcommon being missing. A stock poky, qemux86-64 build on dunfell with DISTRO_FEATURES_remove = "wayland" set in local.conf results in this error during do_configure: | ERROR at //build/config/linux/pkg_config.gni:103:17: Script returned non-zero exit code. | pkgresult = exec_script(pkg_config_script, args, "value") | ^---------- | Current dir: /mnt/ssd/yocto/poky/build/tmp/work/core2-64-poky-linux/chromium-x11/96.0.4664.110-r0/chromium-96.0.4664.110/out/Release/ | Command: python3 /mnt/ssd/yocto/poky/build/tmp/work/core2-64-poky-linux/chromium-x11/96.0.4664.110-r0/chromium-96.0.4664.110/build/config/linux/pkg-config.py xkbcommon | Returned 1. | stderr: | | Package xkbcommon was not found in the pkg-config search path. | Perhaps you should add the directory containing `xkbcommon.pc' | to the PKG_CONFIG_PATH environment variable | No package 'xkbcommon' found | Could not run pkg-config. | | See //ui/events/ozone/layout/BUILD.gn:11:3: whence it was called. | pkg_config("xkbcommon") { | ^------------------------ | See //chrome/test/chromedriver/BUILD.gn:295:7: which caused the file to be included. | "//ui/events/ozone/layout", | ^------------------------- Add the libxkbcommon dependency so it is set for both wayland and x11 builds. Signed-off-by: Robert Joslyn <robert.joslyn@redrectangle.org>
1 parent 1129c17 commit a25979d

File tree

2 files changed

+1
-1
lines changed

2 files changed

+1
-1
lines changed

meta-chromium/recipes-browser/chromium/chromium-gn.inc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ DEPENDS += " \
7272
jpeg \
7373
libdrm \
7474
libwebp \
75+
libxkbcommon \
7576
libxslt \
7677
ninja-native \
7778
nodejs-native \

meta-chromium/recipes-browser/chromium/chromium-ozone-wayland_96.0.4664.110.bb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ REQUIRED_DISTRO_FEATURES = "wayland"
44

55
DEPENDS += "\
66
at-spi2-atk \
7-
libxkbcommon \
87
virtual/egl \
98
wayland \
109
wayland-native \

0 commit comments

Comments
 (0)