NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/freerdp: fix dependency on walyand

Browse Source 
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 <Adamduskett@outlook.com>
Tested-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Adam Duskett 2017-11-25 14:33:05 -05:00 committed by Thomas Petazzoni
parent 7780cef535
commit f79cc7dc15
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/freerdp/freerdp.mk
View File

@ -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 \