* [Buildroot] [PATCH v2 1/1] package/cwiid: add optional dependency to bluez5_utils
@ 2017-03-21 7:22 Bernd Kuhls
2017-03-21 7:31 ` Baruch Siach
0 siblings, 1 reply; 4+ messages in thread
From: Bernd Kuhls @ 2017-03-21 7:22 UTC (permalink / raw)
To: buildroot
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
v2: fix circular dependency (Arnout)
package/cwiid/Config.in | 2 +-
package/cwiid/cwiid.mk | 8 +++++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/package/cwiid/Config.in b/package/cwiid/Config.in
index 03b7dbbcd..ed56e1084 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_BLUEZ5_UTILS if !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 36450c17e..5bccebe87 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
--
2.11.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH v2 1/1] package/cwiid: add optional dependency to bluez5_utils
2017-03-21 7:22 [Buildroot] [PATCH v2 1/1] package/cwiid: add optional dependency to bluez5_utils Bernd Kuhls
@ 2017-03-21 7:31 ` Baruch Siach
2017-03-21 8:36 ` Arnout Vandecappelle
0 siblings, 1 reply; 4+ messages in thread
From: Baruch Siach @ 2017-03-21 7:31 UTC (permalink / raw)
To: buildroot
Hi Bernd,
On Tue, Mar 21, 2017 at 08:22:07AM +0100, Bernd Kuhls wrote:
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
> v2: fix circular dependency (Arnout)
>
> package/cwiid/Config.in | 2 +-
> package/cwiid/cwiid.mk | 8 +++++++-
> 2 files changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/package/cwiid/Config.in b/package/cwiid/Config.in
> index 03b7dbbcd..ed56e1084 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_BLUEZ5_UTILS if !BR2_PACKAGE_BLUEZ_UTILS
You need to add missing bluez5_utils dependencies
(BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4, BR2_TOOLCHAIN_HAS_SYNC_4). Changing
bluez_utils to bluez5_utils in the comments above would also be nice.
baruch
--
http://baruch.siach.name/blog/ ~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -
^ permalink raw reply [flat|nested] 4+ messages in thread* [Buildroot] [PATCH v2 1/1] package/cwiid: add optional dependency to bluez5_utils
2017-03-21 7:31 ` Baruch Siach
@ 2017-03-21 8:36 ` Arnout Vandecappelle
2017-05-07 20:16 ` Thomas Petazzoni
0 siblings, 1 reply; 4+ messages in thread
From: Arnout Vandecappelle @ 2017-03-21 8:36 UTC (permalink / raw)
To: buildroot
On 21-03-17 08:31, Baruch Siach wrote:
> Hi Bernd,
>
> On Tue, Mar 21, 2017 at 08:22:07AM +0100, Bernd Kuhls wrote:
>> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
>> ---
>> v2: fix circular dependency (Arnout)
>>
>> package/cwiid/Config.in | 2 +-
>> package/cwiid/cwiid.mk | 8 +++++++-
>> 2 files changed, 8 insertions(+), 2 deletions(-)
>>
>> diff --git a/package/cwiid/Config.in b/package/cwiid/Config.in
>> index 03b7dbbcd..ed56e1084 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_BLUEZ5_UTILS if !BR2_PACKAGE_BLUEZ_UTILS
>
> You need to add missing bluez5_utils dependencies
> (BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4, BR2_TOOLCHAIN_HAS_SYNC_4). Changing
> bluez_utils to bluez5_utils in the comments above would also be nice.
Darn, this is getting complicated... We would want to keep the dependencies as
they are, and use bluez_utils in case bluez5_utils are not available. But that
would mean something like:
select BR2_PACKAGE_BLUEZ5_UTILS if !BR2_PACKAGE_BLUEZ_UTILS \
&& BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 \
&& BR2_TOOLCHAIN_HAS_SYNC_4
select BR2_PACKAGE_BLUEZ_UTILS if !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 \
|| !BR2_TOOLCHAIN_HAS_SYNC_4
Yuk...
Perhaps a BR2_PACKAGE_BLUEZ5_UTILS_ARCH_SUPPORTS would help?
Regards,
Arnout
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH v2 1/1] package/cwiid: add optional dependency to bluez5_utils
2017-03-21 8:36 ` Arnout Vandecappelle
@ 2017-05-07 20:16 ` Thomas Petazzoni
0 siblings, 0 replies; 4+ messages in thread
From: Thomas Petazzoni @ 2017-05-07 20:16 UTC (permalink / raw)
To: buildroot
Hello,
On Tue, 21 Mar 2017 09:36:23 +0100, Arnout Vandecappelle wrote:
> >> - select BR2_PACKAGE_BLUEZ_UTILS
> >> + select BR2_PACKAGE_BLUEZ5_UTILS if !BR2_PACKAGE_BLUEZ_UTILS
> >
> > You need to add missing bluez5_utils dependencies
> > (BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4, BR2_TOOLCHAIN_HAS_SYNC_4). Changing
> > bluez_utils to bluez5_utils in the comments above would also be nice.
>
> Darn, this is getting complicated... We would want to keep the dependencies as
> they are, and use bluez_utils in case bluez5_utils are not available. But that
> would mean something like:
>
> select BR2_PACKAGE_BLUEZ5_UTILS if !BR2_PACKAGE_BLUEZ_UTILS \
> && BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 \
> && BR2_TOOLCHAIN_HAS_SYNC_4
> select BR2_PACKAGE_BLUEZ_UTILS if !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 \
> || !BR2_TOOLCHAIN_HAS_SYNC_4
>
> Yuk...
>
> Perhaps a BR2_PACKAGE_BLUEZ5_UTILS_ARCH_SUPPORTS would help?
Perhaps it's a case where we need to use a "depends on" dependency
rather than a "select" dependency, i.e do:
depends on BR2_PACKAGE_BLUEZ5_UTILS || BR2_PACKAGE_BLUEZ_UTILS
Bernd, could you resubmit your patch with this idea? Don't forget to
remove the "depends on" on toolchain/architecture features that are no
longer needed.
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-05-07 20:16 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-03-21 7:22 [Buildroot] [PATCH v2 1/1] package/cwiid: add optional dependency to bluez5_utils Bernd Kuhls
2017-03-21 7:31 ` Baruch Siach
2017-03-21 8:36 ` Arnout Vandecappelle
2017-05-07 20:16 ` Thomas Petazzoni
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox