[Buildroot] [git commit branch/2021.02.x] package/cage: only enable XWayland if wlroots has X11
From: Peter Korsgaard <peter@korsgaard.com>
Date: 2022-01-24 17:36:30
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: Peter Korsgaard <peter@korsgaard.com>
Date: 2022-01-24 17:36:30
Subsystem:
the rest · Maintainer:
Linus Torvalds
commit: https://git.buildroot.net/buildroot/commit/?id=4294adf244cd5083ba957a106c4a13562692367d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x Cage requires wlroots to be built with X11 enabled in order to enable XWayland, otherwise it will fail with error: "ERROR: Problem encountered: Cannot build Cage with XWayland support: wlroots has been built without it" Signed-off-by: Yunhao Tian <redacted> [yann.morin.1998@free.fr: - drop explicit _XORG7, as _WLROOTS_X11 depends on it ] Signed-off-by: Yann E. MORIN <redacted> (cherry picked from commit 3e4c2d6213a09e9a0c598f800510acd6687ffcda) Signed-off-by: Peter Korsgaard <peter@korsgaard.com> --- package/cage/cage.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/cage/cage.mk b/package/cage/cage.mk
index 9fc01d36c1..731702b4d3 100644
--- a/package/cage/cage.mk
+++ b/package/cage/cage.mk@@ -10,7 +10,7 @@ CAGE_LICENSE = MIT CAGE_LICENSE_FILES = LICENSE CAGE_DEPENDENCIES = host-pkgconf wlroots -ifeq ($(BR2_PACKAGE_XORG7),y) +ifeq ($(BR2_PACKAGE_WLROOTS_X11),y) CAGE_CONF_OPTS = -Dxwayland=true else CAGE_CONF_OPTS = -Dxwayland=false
_______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot