From 82bb6460a75bc4cfe65e56a7f3c6f3d653f361ff Mon Sep 17 00:00:00 2001 From: jwinterm Date: Sun, 21 Jun 2026 12:34:48 -0400 Subject: [PATCH] depends(wayland): native wayland-scanner.pc is in the multiarch pkgconfig dir The find debug showed wayland-scanner.pc at /lib/x86_64-linux-gnu/pkgconfig (multiarch layout), not lib/pkgconfig or share/pkgconfig. Add that path to the pkg-config vars so cross-meson finds the native scanner. Keeps native Wayland support (no disabling). --- contrib/depends/packages/wayland.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/depends/packages/wayland.mk b/contrib/depends/packages/wayland.mk index 66c2424c..ebc807c9 100644 --- a/contrib/depends/packages/wayland.mk +++ b/contrib/depends/packages/wayland.mk @@ -19,7 +19,7 @@ define $(package)_preprocess_cmds endef define $(package)_config_cmds - find $(build_prefix) -name 'wayland-scanner*' -print 2>/dev/null ; PKG_CONFIG_LIBDIR="$(host_prefix)/lib/pkgconfig:$(build_prefix)/lib/pkgconfig:$(build_prefix)/share/pkgconfig" PKG_CONFIG_PATH="$(build_prefix)/lib/pkgconfig:$(build_prefix)/share/pkgconfig" PKG_CONFIG_PATH_FOR_BUILD="$(build_prefix)/lib/pkgconfig:$(build_prefix)/share/pkgconfig" meson setup --cross-file toolchain.txt build -Ddtd_validation=false -Ddocumentation=false -Dprefer_static=true -Ddefault_library=static -Dtests=false -Dscanner=false + PKG_CONFIG_LIBDIR="$(host_prefix)/lib/pkgconfig:$(build_prefix)/lib/pkgconfig:$(build_prefix)/lib/x86_64-linux-gnu/pkgconfig:$(build_prefix)/share/pkgconfig" PKG_CONFIG_PATH="$(build_prefix)/lib/pkgconfig:$(build_prefix)/lib/x86_64-linux-gnu/pkgconfig:$(build_prefix)/share/pkgconfig" PKG_CONFIG_PATH_FOR_BUILD="$(build_prefix)/lib/pkgconfig:$(build_prefix)/lib/x86_64-linux-gnu/pkgconfig:$(build_prefix)/share/pkgconfig" meson setup --cross-file toolchain.txt build -Ddtd_validation=false -Ddocumentation=false -Dprefer_static=true -Ddefault_library=static -Dtests=false -Dscanner=false endef define $(package)_build_cmds