From: Adam Duskett Date: Sat, 25 Nov 2017 19:33:05 +0000 (-0500) Subject: package/freerdp: fix dependency on walyand X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f79cc7dc157e885b879637d428971ce89777f85c;p=buildroot.git package/freerdp: fix dependency on walyand Currently, wayland support is enabled when the wayland package is enabled, not when the FreeRDP wayland client is enabled. But the dependency on libxkbcomon is only enforced from Config.in when the FreeRDP wayland client is enabled., but is added to build dependencies when the wayland package is enabled. As such, we can end up in a situation where the FreeRDP wayland client is disabled, the wayland package is enabled, and the libxkbcommon package is also disabled, which casues the build to fail with: Makefile:539: *** libxkbcommon is in the dependency chain of freerdp that has added it to its _DEPENDENCIES variable without selecting it or depending on it from Config.in. Stop. Change the build dependency to actually be on the FreeRDP client being enabled. Fixes; http://autobuild.buildroot.net/results/dc3e11f7076a8355f3d2f9cb49c6325dcf7084bd Signed-off-by: Adam Duskett Tested-by: "Yann E. MORIN" Acked-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk index 69a89a190c..0ceef576a8 100644 --- a/package/freerdp/freerdp.mk +++ b/package/freerdp/freerdp.mk @@ -198,7 +198,7 @@ else FREERDP_CONF_OPTS += -DWITH_XV=OFF endif -ifeq ($(BR2_PACKAGE_WAYLAND),y) +ifeq ($(BR2_PACKAGE_FREERDP_CLIENT_WL),y) FREERDP_DEPENDENCIES += wayland libxkbcommon FREERDP_CONF_OPTS += \ -DWITH_WAYLAND=ON \