bluez_utils: broken for static builds

The bluez_utils package requires shared library support unconditionally.
We can't fix it to make it build on static because, for instance,
"plugin.c" file uses dlfcn and it's a basic prereq for bluetoothd, so
add "depend on !BR2_PREFER_STATIC_LIB" to it and recursively to all
packages that selects BR2_PACKAGE_BLUEZ_UTILS.

Fixes:

   http://autobuild.buildroot.net/results/d81/d81970024649c1e89c01da491c63760afdad6cb6/

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Vicente Olivert Riera 2013-12-05 17:56:48 +00:00 committed by Thomas Petazzoni
parent 87492d244a
commit fe093f226c
6 changed files with 20 additions and 10 deletions

View File

@ -1,6 +1,7 @@
config BR2_PACKAGE_BLUEZ_UTILS config BR2_PACKAGE_BLUEZ_UTILS
bool "bluez-utils" bool "bluez-utils"
depends on !BR2_avr32 depends on !BR2_avr32
depends on !BR2_PREFER_STATIC_LIB
depends on BR2_USE_WCHAR # libglib2 depends on BR2_USE_WCHAR # libglib2
depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, alsa-lib, libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, alsa-lib, libglib2
depends on BR2_USE_MMU # dbus, libglib2 depends on BR2_USE_MMU # dbus, libglib2
@ -45,6 +46,6 @@ config BR2_PACKAGE_BLUEZ_UTILS_GATT
This will install the gatttool utility. This will install the gatttool utility.
endif endif
comment "bluez-utils needs a toolchain w/ wchar, threads" comment "bluez-utils needs a toolchain w/ wchar, threads, dynamic library"
depends on !BR2_avr32 && BR2_USE_MMU depends on !BR2_avr32 && BR2_USE_MMU
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_PREFER_STATIC_LIB

View File

@ -17,15 +17,16 @@ if BR2_PACKAGE_LIBEDBUS
config BR2_PACKAGE_LIBEDBUS_BLUEZ config BR2_PACKAGE_LIBEDBUS_BLUEZ
bool "bluez support" bool "bluez support"
depends on !BR2_avr32 # bluez_utils depends on !BR2_avr32 # bluez_utils
depends on !BR2_PREFER_STATIC_LIB # bluez_utils
depends on BR2_USE_WCHAR # bluez_utils -> glib2 depends on BR2_USE_WCHAR # bluez_utils -> glib2
depends on BR2_TOOLCHAIN_HAS_THREADS # bluez_utils -> glib2 depends on BR2_TOOLCHAIN_HAS_THREADS # bluez_utils -> glib2
select BR2_PACKAGE_BLUEZ_UTILS select BR2_PACKAGE_BLUEZ_UTILS
help help
Bluetooth support. Bluetooth support.
comment "bluez support needs a toolchain w/ wchar, threads" comment "bluez support needs a toolchain w/ wchar, threads, dynamic library"
depends on !BR2_avr32 depends on !BR2_avr32
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_PREFER_STATIC_LIB
config BR2_PACKAGE_LIBEDBUS_CONNMAN config BR2_PACKAGE_LIBEDBUS_CONNMAN
bool "connman support" bool "connman support"

View File

@ -12,14 +12,15 @@ if BR2_PACKAGE_OPENOBEX
config BR2_PACKAGE_OPENOBEX_BLUEZ config BR2_PACKAGE_OPENOBEX_BLUEZ
bool "enable bluez support" bool "enable bluez support"
depends on !BR2_avr32 depends on !BR2_avr32
depends on !BR2_PREFER_STATIC_LIB # bluez_utils
depends on BR2_USE_WCHAR # libglib2 depends on BR2_USE_WCHAR # libglib2
depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, alsa-lib, libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, alsa-lib, libglib2
depends on BR2_USE_MMU # dbus depends on BR2_USE_MMU # dbus
select BR2_PACKAGE_BLUEZ_UTILS select BR2_PACKAGE_BLUEZ_UTILS
comment "bluez support needs a toolchain w/ wchar, threads" comment "bluez support needs a toolchain w/ wchar, threads, dynamic library"
depends on !BR2_avr32 && BR2_USE_MMU depends on !BR2_avr32 && BR2_USE_MMU
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_PREFER_STATIC_LIB
config BR2_PACKAGE_OPENOBEX_LIBUSB config BR2_PACKAGE_OPENOBEX_LIBUSB
bool "enable libusb support" bool "enable libusb support"

View File

@ -44,10 +44,15 @@ config BR2_PACKAGE_SCONESERVER_BLUETOOTH
depends on BR2_USE_MMU # bluez->dbus depends on BR2_USE_MMU # bluez->dbus
depends on BR2_TOOLCHAIN_HAS_THREADS # bluez->dbus, bluez->libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # bluez->dbus, bluez->libglib2
depends on !BR2_avr32 # bluez_utils depends on !BR2_avr32 # bluez_utils
depends on !BR2_PREFER_STATIC_LIB # bluez_utils
select BR2_PACKAGE_BLUEZ_UTILS select BR2_PACKAGE_BLUEZ_UTILS
help help
Bluetooth module for Sconeserver Bluetooth module for Sconeserver
comment "bluetooth support needs a toolchain w/ wchar, threads, dynamic library"
depends on !BR2_avr32 && BR2_USE_MMU
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_PREFER_STATIC_LIB
config BR2_PACKAGE_SCONESERVER_RSS config BR2_PACKAGE_SCONESERVER_RSS
bool "rss" bool "rss"
select BR2_PACKAGE_LIBXML2 select BR2_PACKAGE_LIBXML2

View File

@ -3,6 +3,7 @@ config BR2_PACKAGE_SNOWBALL_INIT
# Runtime dependency, needed by snowball startup script # Runtime dependency, needed by snowball startup script
select BR2_PACKAGE_BLUEZ_UTILS select BR2_PACKAGE_BLUEZ_UTILS
depends on !BR2_avr32 depends on !BR2_avr32
depends on !BR2_PREFER_STATIC_LIB # bluez_utils
depends on BR2_USE_WCHAR # libglib2 depends on BR2_USE_WCHAR # libglib2
depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, alsa-lib, libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, alsa-lib, libglib2
depends on BR2_USE_MMU # dbus depends on BR2_USE_MMU # dbus
@ -12,6 +13,6 @@ config BR2_PACKAGE_SNOWBALL_INIT
http://www.igloocommunity.org http://www.igloocommunity.org
comment "snowball-init needs a toolchain w/ wchar, threads" comment "snowball-init needs a toolchain w/ wchar, threads, dynamic library"
depends on !BR2_avr32 && BR2_USE_MMU depends on !BR2_avr32 && BR2_USE_MMU
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_PREFER_STATIC_LIB

View File

@ -2,6 +2,7 @@ config BR2_PACKAGE_USSP_PUSH
bool "ussp-push" bool "ussp-push"
depends on BR2_INET_IPV6 depends on BR2_INET_IPV6
depends on !BR2_avr32 depends on !BR2_avr32
depends on !BR2_PREFER_STATIC_LIB # bluez_utils
depends on BR2_USE_WCHAR # libglib2 depends on BR2_USE_WCHAR # libglib2
depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, alsa-lib, libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, alsa-lib, libglib2
depends on BR2_USE_MMU # dbus depends on BR2_USE_MMU # dbus
@ -14,6 +15,6 @@ config BR2_PACKAGE_USSP_PUSH
http://www.xmailserver.org/ussp-push.html http://www.xmailserver.org/ussp-push.html
comment "ussp-push needs a toolchain w/ wchar, IPv6, threads" comment "ussp-push needs a toolchain w/ wchar, IPv6, threads, dynamic library"
depends on !BR2_avr32 && BR2_USE_MMU depends on !BR2_avr32 && BR2_USE_MMU
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INET_IPV6 depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INET_IPV6 || BR2_PREFER_STATIC_LIB