From: Adrian Perez de Castro Date: Wed, 9 Sep 2020 21:37:56 +0000 (+0300) Subject: package/wlroots: always disable xcb-errors X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c2bc0694c45bb6bc0a19e06b2fcddff365be5a2e;p=buildroot.git 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 Signed-off-by: Yann E. MORIN --- diff --git a/package/wlroots/wlroots.mk b/package/wlroots/wlroots.mk index 27ccc8d5f3..c1771df41d 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 @@ -52,13 +52,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