From 331ee5b7b0de1c8841dd2ea198aedd54f9b0eaf2 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 1 Mar 2017 22:38:37 +0100 Subject: [PATCH] Revert "package/cwiid: add optional dependency to bluez5_utils" This reverts commit d4c4c259d25a8f2c5c2e2a5736609ba285fdd018. It was mistakenly committed and pushed: it causes Kconfig circular dependencies, so it cannot be applied as-is. Signed-off-by: Thomas Petazzoni --- package/cwiid/Config.in | 2 +- package/cwiid/cwiid.mk | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/package/cwiid/Config.in b/package/cwiid/Config.in index 69e54f5b79..03b7dbbcdb 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 if !BR2_PACKAGE_BLUEZ5_UTILS + select BR2_PACKAGE_BLUEZ_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 5bccebe872..36450c17e4 100644 --- a/package/cwiid/cwiid.mk +++ b/package/cwiid/cwiid.mk @@ -12,19 +12,13 @@ CWIID_LICENSE_FILES = COPYING CWIID_AUTORECONF = YES CWIID_INSTALL_STAGING = YES -CWIID_DEPENDENCIES = host-pkgconf host-bison host-flex +CWIID_DEPENDENCIES = host-pkgconf host-bison host-flex bluez_utils # 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 -- 2.30.2