From fad5bc2f615bcee37b653887af0aebb334ec94b5 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Mon, 25 Apr 2022 21:28:34 +0200 Subject: [PATCH] wayland-scanner: use native version to support cross-compilation Cross-compilation support was broken in https://github.com/swaywm/swaylock/commit/55c018a350d52efe7d0db168d15636b900dd9ce4 because wayland-scanner from the host system is used with that change. This patch changes it back to use wayland-scanner from the build system. For normal (non-cross) compilation this shouldn't change anything. Meson also uses the build machine wayland-scanner binary: - https://github.com/mesonbuild/meson/blob/c649a2b8c59c9f49affca9bd89c126bfa0f54449/mesonbuild/modules/unstable_wayland.py#L48-L53 --- meson.build | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index ff120c8..b2e7944 100644 --- a/meson.build +++ b/meson.build @@ -38,7 +38,9 @@ endif wayland_client = dependency('wayland-client', version: '>=1.20.0') wayland_protos = dependency('wayland-protocols', version: '>=1.25', fallback: 'wayland-protocols') -wayland_scanner = dependency('wayland-scanner', version: '>=1.15.0') +# use native version of wayland-scanner when cross-compiling +# meson does this too: https://github.com/mesonbuild/meson/blob/c649a2b8c59c9f49affca9bd89c126bfa0f54449/mesonbuild/modules/unstable_wayland.py#L48-L53 +wayland_scanner = dependency('wayland-scanner', version: '>=1.15.0', native: true) xkbcommon = dependency('xkbcommon') cairo = dependency('cairo') gdk_pixbuf = dependency('gdk-pixbuf-2.0', required: get_option('gdk-pixbuf'))