diff options
| author | Yann E. MORIN <yann.morin.1998@free.fr> | 2017-11-12 09:13:26 +0100 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2017-11-13 21:26:16 +0100 |
| commit | c2824fba2f2f4df6c1e0273fa546a203d1e6d5ac (patch) | |
| tree | b0c85499ce384693ef8991332421b00af4d986ac /package/freerdp | |
| parent | 45f0c11aaab8eff3c8c041936b64931f66fc8a8d (diff) | |
| download | buildroot-c2824fba2f2f4df6c1e0273fa546a203d1e6d5ac.tar.gz buildroot-c2824fba2f2f4df6c1e0273fa546a203d1e6d5ac.zip | |
package/freerdp: fix build of wayland client
Currently, FreeRDP uses pkg-config to find whether wayland is available.
When it is, it gets the CFLAGS and LDFLAGS and so on from pkg-config,
which is OK.
But I also gets the path to the wayland scanner from pkg-config. And
this points to the target one, when we really need the host one.
So we force-feed the correct path as a configure option.
Furthermore, wayland support needs libxkbcommon, so add this missing
dependency as well.
Fixes:
http://autobuild.buildroot.org/results/bdfe233ade36a56d0f65ef3c3d1698fca548beed/
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Reviewed-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/freerdp')
| -rw-r--r-- | package/freerdp/Config.in | 1 | ||||
| -rw-r--r-- | package/freerdp/freerdp.mk | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/package/freerdp/Config.in b/package/freerdp/Config.in index 9dd2505a44..59bc18b672 100644 --- a/package/freerdp/Config.in +++ b/package/freerdp/Config.in @@ -81,6 +81,7 @@ config BR2_PACKAGE_FREERDP_CLIENT_WL bool "wayland client" default y depends on BR2_PACKAGE_WAYLAND + select BR2_PACKAGE_LIBXKBCOMMON endif diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk index 458bd5eea7..69a89a190c 100644 --- a/package/freerdp/freerdp.mk +++ b/package/freerdp/freerdp.mk @@ -199,8 +199,10 @@ FREERDP_CONF_OPTS += -DWITH_XV=OFF endif ifeq ($(BR2_PACKAGE_WAYLAND),y) -FREERDP_DEPENDENCIES += wayland -FREERDP_CONF_OPTS += -DWITH_WAYLAND=ON +FREERDP_DEPENDENCIES += wayland libxkbcommon +FREERDP_CONF_OPTS += \ + -DWITH_WAYLAND=ON \ + -DWAYLAND_SCANNER=$(HOST_DIR)/bin/wayland-scanner else FREERDP_CONF_OPTS += -DWITH_WAYLAND=OFF endif |
