depends(libxkbcommon): explicit xkb extension paths for cross + cache restore-keys

libxkbcommon 1.13.1 meson.build adds empty pkgconfig vars when xkeyboard-config is absent from the cross sysroot (XKEYBOARD_CONFIG_ROOT='') while has_extensions_directories is true -> meson hard-errors at pkgconfig.generate. Pass non-empty -Dxkb-config-(un)versioned-extensions-path.

Add restore-keys to all 4 depends cache restores: a busted exact key (any packages/* edit) now falls back to the newest prefix match, so make resumes from the partial built tree instead of rebuilding the static-Qt6 toolchain from scratch.
This commit is contained in:
jwinterm
2026-06-21 15:09:15 -04:00
parent 82bb6460a7
commit 57531a9d09
2 changed files with 9 additions and 1 deletions
+1 -1
View File
@@ -19,7 +19,7 @@ define $(package)_preprocess_cmds
endef
define $(package)_config_cmds
meson setup --cross-file toolchain.txt build -Dxkb-config-root=/usr/share/X11/xkb -Dxkb-config-extra-path=/app/share/X11/xkb
meson setup --cross-file toolchain.txt build -Dxkb-config-root=/usr/share/X11/xkb -Dxkb-config-extra-path=/app/share/X11/xkb -Dxkb-config-unversioned-extensions-path=/usr/share/X11/xkb.d -Dxkb-config-versioned-extensions-path=/usr/share/X11/xkb.d
endef
define $(package)_build_cmds