db5bccc044
wlroots is a modular library which provides building blocks to implement Wayland compositors. wlroots is a dependency of the Cage Wayland compositor. https://github.com/swaywm/wlroots/ Signed-off-by: Adrian Perez de Castro <aperez@igalia.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
46 lines
1.7 KiB
Diff
46 lines
1.7 KiB
Diff
From 72138a67c8e6b0154aadc1b5fcb3d661033fbcd3 Mon Sep 17 00:00:00 2001
|
|
From: Adrian Perez de Castro <aperez@igalia.com>
|
|
Date: Thu, 13 Jun 2019 02:13:47 +0300
|
|
Subject: [PATCH] Do not use pkg-config to find wayland-scanner when cross
|
|
building
|
|
|
|
When cross-compiling it is still needed to run a native wayland-scanner,
|
|
but many tools for the task will still have pkg-config return the
|
|
location of wayland-scanner for the target in some location which may
|
|
be the same as for some native installation of wayland-scanner; but
|
|
which is not the copy of the program that the compilation system wants
|
|
packages to use (which are typically in a "host tools" directory
|
|
elsewhere).
|
|
|
|
This disables usage of pkg-config to find wayland-scanner when
|
|
cross-compiling because most tools for the job will set $PATH in a way
|
|
that the correct installation of the tool will be found first.
|
|
|
|
Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
|
|
[Upstream status: https://github.com/swaywm/wlroots/pull/1722]
|
|
|
|
---
|
|
protocol/meson.build | 7 ++++++-
|
|
1 file changed, 6 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/protocol/meson.build b/protocol/meson.build
|
|
index 7cc10320..73c06b24 100644
|
|
--- a/protocol/meson.build
|
|
+++ b/protocol/meson.build
|
|
@@ -1,6 +1,11 @@
|
|
wl_protocol_dir = wayland_protos.get_pkgconfig_variable('pkgdatadir')
|
|
|
|
-wayland_scanner_dep = dependency('wayland-scanner', required: false, native: true)
|
|
+if meson.is_cross_build()
|
|
+ wayland_scanner_dep = disabler()
|
|
+else
|
|
+ wayland_scanner_dep = dependency('wayland-scanner', required: false, native: true)
|
|
+endif
|
|
+
|
|
if wayland_scanner_dep.found()
|
|
wayland_scanner = find_program(
|
|
wayland_scanner_dep.get_pkgconfig_variable('wayland_scanner'),
|
|
--
|
|
2.22.0
|
|
|