summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Kepplinger <martink@posteo.de>2017-04-30 15:05:02 +0200
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2017-04-30 23:02:03 +0200
commit61d0a65557d7c269d563962ca03b04c4d7c62a92 (patch)
tree103159192030561821597c7667d339e6b528a7e7
parentf3f631cdaedd8c10770c07b01e064d38715d3145 (diff)
downloadbuildroot-61d0a65557d7c269d563962ca03b04c4d7c62a92.tar.gz
buildroot-61d0a65557d7c269d563962ca03b04c4d7c62a92.zip
package/x11vnc: add dependency on libvncserver
x11vnc needs libvncserver, so select it explicitely. Fixes: http://autobuild.buildroot.net/results/34f8045e772b96293cc7d25bd61ac0aa5842824f/ Signed-off-by: Martin Kepplinger <martink@posteo.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/x11vnc/Config.in2
-rw-r--r--package/x11vnc/x11vnc.mk2
2 files changed, 3 insertions, 1 deletions
diff --git a/package/x11vnc/Config.in b/package/x11vnc/Config.in
index 0909b9aec4..9e91a11ad1 100644
--- a/package/x11vnc/Config.in
+++ b/package/x11vnc/Config.in
@@ -2,6 +2,8 @@ config BR2_PACKAGE_X11VNC
bool "x11vnc"
depends on BR2_PACKAGE_XORG7
depends on BR2_USE_MMU # fork()
+ depends on !BR2_nios2 # libvncserver
+ select BR2_PACKAGE_LIBVNCSERVER
select BR2_PACKAGE_XLIB_LIBXT
select BR2_PACKAGE_XLIB_LIBXEXT
select BR2_PACKAGE_XLIB_LIBXTST
diff --git a/package/x11vnc/x11vnc.mk b/package/x11vnc/x11vnc.mk
index 9233b7047a..f1f4da21bc 100644
--- a/package/x11vnc/x11vnc.mk
+++ b/package/x11vnc/x11vnc.mk
@@ -9,7 +9,7 @@ X11VNC_SITE = $(call github,LibVNC,x11vnc,$(X11VNC_VERSION))
# sdl support is not used in x11vnc, but host include / library search paths
# leak in if host has sdl-config
X11VNC_CONF_OPTS = --without-sdl
-X11VNC_DEPENDENCIES = xlib_libXt xlib_libXext xlib_libXtst
+X11VNC_DEPENDENCIES = xlib_libXt xlib_libXext xlib_libXtst libvncserver
X11VNC_LICENSE = GPL-2.0+
X11VNC_LICENSE_FILES = COPYING
OpenPOWER on IntegriCloud