depends(wayland): native wayland-scanner.pc is in the multiarch pkgconfig dir

The find debug showed wayland-scanner.pc at <build_prefix>/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).
This commit is contained in:
jwinterm
2026-06-21 12:34:48 -04:00
parent 7e936ba968
commit 82bb6460a7
+1 -1
View File
@@ -19,7 +19,7 @@ define $(package)_preprocess_cmds
endef endef
define $(package)_config_cmds 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 endef
define $(package)_build_cmds define $(package)_build_cmds