Commit fe093f22 authored by Vicente Olivert Riera's avatar Vicente Olivert Riera Committed by Thomas Petazzoni
Browse files

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: default avatarVicente Olivert Riera <Vincent.Riera@imgtec.com>
Acked-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 87492d24

package/bluez_utils/Config.in

+3 −2
Original line number Diff line number Diff line 
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

package/efl/libedbus/Config.in

+3 −2
Original line number Diff line number Diff line
@@ -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"

package/openobex/Config.in

+3 −2
Original line number Diff line number Diff line
@@ -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"

package/sconeserver/Config.in

+5 −0
Original line number Diff line number Diff line
@@ -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

package/snowball-init/Config.in

+3 −2
Original line number Diff line number Diff line
@@ -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