aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Adrian Perez de Castro <aperez@igalia.com>2020-09-10 00:37:56 +0300
committerGravatar Peter Korsgaard <peter@korsgaard.com>2020-09-15 19:55:46 +0200
commit5485d509dbb449dd0cd4f2f3962d16d0f767ed37 (patch)
treec3c0597deb175959d073f71595a03ff089c41b59
parent92da2f42e97005615a825c957bb1eba2e72e9a76 (diff)
downloadbuildroot-5485d509dbb449dd0cd4f2f3962d16d0f767ed37.tar.gz
buildroot-5485d509dbb449dd0cd4f2f3962d16d0f767ed37.tar.bz2
package/wlroots: always disable xcb-errors
Stop trying to enable the xcb-errors Meson option and always disable it: there is no xcb-util-errors package in Buildroot. The build recipe was wrongly assuming that the XCB errors library would be installed as part of the xcb-util package, which is not the case. Fixes the following autobuilder failure: http://autobuild.buildroot.net/results/1891aa624b29e4bbcbbe6bc752a1cc90c316024e/ Signed-off-by: Adrian Perez de Castro <aperez@igalia.com> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr> (cherry picked from commit c2bc0694c45bb6bc0a19e06b2fcddff365be5a2e) Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/wlroots/wlroots.mk9
1 files changed, 1 insertions, 8 deletions
diff --git a/package/wlroots/wlroots.mk b/package/wlroots/wlroots.mk
index 988643485f..8b646b4536 100644
--- a/package/wlroots/wlroots.mk
+++ b/package/wlroots/wlroots.mk
@@ -21,7 +21,7 @@ WLROOTS_DEPENDENCIES = \
wayland \
wayland-protocols
-WLROOTS_CONF_OPTS = -Dexamples=false
+WLROOTS_CONF_OPTS = -Dexamples=false -Dxcb-errors=disabled
ifeq ($(BR2_PACKAGE_FFMPEG),y)
WLROOTS_DEPENDENCIES += ffmpeg
@@ -59,13 +59,6 @@ else
WLROOTS_CONF_OPTS += -Dxwayland=disabled
endif
-ifeq ($(BR2_PACKAGE_XCB_UTIL),y)
-WLROOTS_CONF_OPTS += -Dxcb-errors=enabled
-WLROOTS_DEPENDENCIES += xcb-util
-else
-WLROOTS_CONF_OPTS += -Dxcb-errors=disabled
-endif
-
ifeq ($(BR2_PACKAGE_XCB_UTIL_WM),y)
WLROOTS_CONF_OPTS += -Dxcb-icccm=enabled
WLROOTS_DEPENDENCIES += xcb-util-wm