summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBernd Kuhls <bernd.kuhls@t-online.de>2017-02-19 14:18:34 +0100
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2017-03-01 22:21:30 +0100
commitd4c4c259d25a8f2c5c2e2a5736609ba285fdd018 (patch)
treef2550bd635d7b1d6cb9ff9ae081c190473f2d7a3
parentb9ea113f69f0edbbc7c8df6eec84f2cb312e637e (diff)
downloadbuildroot-d4c4c259d25a8f2c5c2e2a5736609ba285fdd018.tar.gz
buildroot-d4c4c259d25a8f2c5c2e2a5736609ba285fdd018.zip
package/cwiid: add optional dependency to bluez5_utils
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/cwiid/Config.in2
-rw-r--r--package/cwiid/cwiid.mk8
2 files changed, 8 insertions, 2 deletions
diff --git a/package/cwiid/Config.in b/package/cwiid/Config.in
index 03b7dbbcdb..69e54f5b79 100644
--- a/package/cwiid/Config.in
+++ b/package/cwiid/Config.in
@@ -4,7 +4,7 @@ config BR2_PACKAGE_CWIID
depends on BR2_USE_WCHAR # bluez_utils -> libglib2
depends on BR2_TOOLCHAIN_HAS_THREADS # bluez_utils -> dbus, alsa-lib, libglib2
depends on BR2_USE_MMU # bluez_utils -> dbus, libglib2
- select BR2_PACKAGE_BLUEZ_UTILS
+ select BR2_PACKAGE_BLUEZ_UTILS if !BR2_PACKAGE_BLUEZ5_UTILS
help
A collection of Linux tools written in C for interfacing to the
Nintendo Wiimote.
diff --git a/package/cwiid/cwiid.mk b/package/cwiid/cwiid.mk
index 36450c17e4..5bccebe872 100644
--- a/package/cwiid/cwiid.mk
+++ b/package/cwiid/cwiid.mk
@@ -12,13 +12,19 @@ CWIID_LICENSE_FILES = COPYING
CWIID_AUTORECONF = YES
CWIID_INSTALL_STAGING = YES
-CWIID_DEPENDENCIES = host-pkgconf host-bison host-flex bluez_utils
+CWIID_DEPENDENCIES = host-pkgconf host-bison host-flex
# Disable python support. This disables the 2 following things:
# - wminput Python plugin support
# - cwiid Python module
CWIID_CONF_OPTS = --without-python --disable-ldconfig
+ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS),y)
+CWIID_DEPENDENCIES += bluez5_utils
+else
+CWIID_DEPENDENCIES += bluez_utils
+endif
+
ifeq ($(BR2_PACKAGE_CWIID_WMGUI),y)
CWIID_DEPENDENCIES += libgtk2 libglib2
CWIID_CONF_OPTS += --enable-wmgui
OpenPOWER on IntegriCloud