From a4e38fc7127b8d270d0b5f8ed653755535c452e8 Mon Sep 17 00:00:00 2001 From: jwinterm Date: Sun, 21 Jun 2026 09:38:43 -0400 Subject: [PATCH] depends(wayland): search share/pkgconfig for native wayland-scanner (+ debug find) wayland-scanner.pc is a noarch .pc -> build_prefix/share/pkgconfig, not lib/pkgconfig, so the earlier PKG_CONFIG_PATH_FOR_BUILD missed it. Add share/pkgconfig to LIBDIR/PATH/PATH_FOR_BUILD + a find to log the real location. --- contrib/depends/packages/wayland.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/contrib/depends/packages/wayland.mk b/contrib/depends/packages/wayland.mk index b64c3d8f..2f88a7a9 100644 --- a/contrib/depends/packages/wayland.mk +++ b/contrib/depends/packages/wayland.mk @@ -19,7 +19,8 @@ define $(package)_preprocess_cmds endef define $(package)_config_cmds - PKG_CONFIG_LIBDIR="$(host_prefix)/lib/pkgconfig:$(build_prefix)/lib/pkgconfig" PKG_CONFIG_PATH="$(build_prefix)/lib/pkgconfig" PKG_CONFIG_PATH_FOR_BUILD="$(build_prefix)/lib/pkgconfig" meson setup --cross-file toolchain.txt build -Ddtd_validation=false -Ddocumentation=false -Dprefer_static=true -Ddefault_library=static -Dtests=false -Dscanner=false + echo "=== wayland-scanner in build_prefix ===" ; find $(build_prefix) -name 'wayland-scanner*' 2>/dev/null ; echo "=== end ===" + 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 endef define $(package)_build_cmds