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>

diff --git a/package/bluez_utils/Config.in b/package/bluez_utils/Config.in
index 1315b9ef4166cb497b0ba7a0cfb81a41df576e0c..9efd83df6c501ad6901aa1fdd5d85e8d7e9088eb 100644 (file)
--- a/package/bluez_utils/Config.in
+++ b/package/bluez_utils/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_BLUEZ_UTILS
        bool "bluez-utils"
        depends on !BR2_avr32
+       depends on !BR2_PREFER_STATIC_LIB
        depends on BR2_USE_WCHAR # libglib2
        depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, alsa-lib, libglib2
        depends on BR2_USE_MMU # dbus, libglib2
@@ -45,6 +46,6 @@ config BR2_PACKAGE_BLUEZ_UTILS_GATT
          This will install the gatttool utility.
 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_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
+       depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_PREFER_STATIC_LIB

diff --git a/package/efl/libedbus/Config.in b/package/efl/libedbus/Config.in
index 783a54e7f39cd942114921a832e8c26040bd426e..907c7fed12ffdb8d8ef47fac097095f81abc1a61 100644 (file)
--- a/package/efl/libedbus/Config.in
+++ b/package/efl/libedbus/Config.in
@@ -17,15 +17,16 @@ if BR2_PACKAGE_LIBEDBUS
 config BR2_PACKAGE_LIBEDBUS_BLUEZ
        bool "bluez support"
        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_TOOLCHAIN_HAS_THREADS # bluez_utils -> glib2
        select BR2_PACKAGE_BLUEZ_UTILS
        help
          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_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
+       depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_PREFER_STATIC_LIB
 
 config BR2_PACKAGE_LIBEDBUS_CONNMAN
        bool "connman support"

diff --git a/package/openobex/Config.in b/package/openobex/Config.in
index 9b9d2f9a29fa034d79c92c84e2555eea90694e40..b52f757595f42182d04736a1c73fdbd1fd485ada 100644 (file)
--- a/package/openobex/Config.in
+++ b/package/openobex/Config.in
@@ -12,14 +12,15 @@ if BR2_PACKAGE_OPENOBEX
 config BR2_PACKAGE_OPENOBEX_BLUEZ
        bool "enable bluez support"
        depends on !BR2_avr32
+       depends on !BR2_PREFER_STATIC_LIB # bluez_utils
        depends on BR2_USE_WCHAR # libglib2
        depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, alsa-lib, libglib2
        depends on BR2_USE_MMU # dbus
        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_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
+       depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_PREFER_STATIC_LIB
 
 config BR2_PACKAGE_OPENOBEX_LIBUSB
        bool "enable libusb support"

diff --git a/package/sconeserver/Config.in b/package/sconeserver/Config.in
index 58c1e036fd0d93f85028af5eb7f5f9a50c2331fa..b8755c618495c8dc2b3bf739fb145b039cc4c654 100644 (file)
--- a/package/sconeserver/Config.in
+++ b/package/sconeserver/Config.in
@@ -44,10 +44,15 @@ config BR2_PACKAGE_SCONESERVER_BLUETOOTH
        depends on BR2_USE_MMU # bluez->dbus
        depends on BR2_TOOLCHAIN_HAS_THREADS # bluez->dbus, bluez->libglib2
        depends on !BR2_avr32 # bluez_utils
+       depends on !BR2_PREFER_STATIC_LIB # bluez_utils
        select BR2_PACKAGE_BLUEZ_UTILS
        help
          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
        bool "rss"
        select BR2_PACKAGE_LIBXML2

diff --git a/package/snowball-init/Config.in b/package/snowball-init/Config.in
index e6e3272c88c0dac7e900ea7210f26b3ae2be7a31..d633d89dd5262ec7d7f2bb7bf8958ca06c59d81a 100644 (file)
--- a/package/snowball-init/Config.in
+++ b/package/snowball-init/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_SNOWBALL_INIT
        # Runtime dependency, needed by snowball startup script
        select BR2_PACKAGE_BLUEZ_UTILS
        depends on !BR2_avr32
+       depends on !BR2_PREFER_STATIC_LIB # bluez_utils
        depends on BR2_USE_WCHAR # libglib2
        depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, alsa-lib, libglib2
        depends on BR2_USE_MMU # dbus
@@ -12,6 +13,6 @@ config BR2_PACKAGE_SNOWBALL_INIT
 
          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_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
+       depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_PREFER_STATIC_LIB

diff --git a/package/ussp-push/Config.in b/package/ussp-push/Config.in
index 4a79779dd08a431c62158bc1ed837de703200d34..c8facef4e2244605361de758369e0459bb2bf157 100644 (file)
--- a/package/ussp-push/Config.in
+++ b/package/ussp-push/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_USSP_PUSH
        bool "ussp-push"
        depends on BR2_INET_IPV6
        depends on !BR2_avr32
+       depends on !BR2_PREFER_STATIC_LIB # bluez_utils
        depends on BR2_USE_WCHAR # libglib2
        depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, alsa-lib, libglib2
        depends on BR2_USE_MMU # dbus
@@ -14,6 +15,6 @@ config BR2_PACKAGE_USSP_PUSH
 
          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_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