From patchwork Thu Dec 5 17:56:48 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vicente Olivert Riera X-Patchwork-Id: 297339 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id 252DF2C00A4 for ; Fri, 6 Dec 2013 04:57:07 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 67A5032FAA; Thu, 5 Dec 2013 17:57:06 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id SsviBxkP0-yu; Thu, 5 Dec 2013 17:57:02 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id AB12D26703; Thu, 5 Dec 2013 17:57:01 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id E152F1BF9A6 for ; Thu, 5 Dec 2013 17:57:00 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id DD2898C857 for ; Thu, 5 Dec 2013 17:57:00 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id OLmUZ-7-EZCZ for ; Thu, 5 Dec 2013 17:56:59 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from multi.imgtec.com (multi.imgtec.com [194.200.65.239]) by whitealder.osuosl.org (Postfix) with ESMTPS id 437978C7E7 for ; Thu, 5 Dec 2013 17:56:59 +0000 (UTC) From: Vicente Olivert Riera To: Date: Thu, 5 Dec 2013 17:56:48 +0000 Message-ID: <1386266208-52779-1-git-send-email-Vincent.Riera@imgtec.com> X-Mailer: git-send-email 1.7.1 MIME-Version: 1.0 X-Originating-IP: [192.168.154.104] X-SEF-Processed: 7_3_0_01192__2013_12_05_17_56_58 Subject: [Buildroot] [PATCH v3] bluez_utils: broken for static builds X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net 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 Acked-by: Thomas Petazzoni --- package/bluez_utils/Config.in | 5 +++-- package/efl/libedbus/Config.in | 5 +++-- package/openobex/Config.in | 5 +++-- package/sconeserver/Config.in | 5 +++++ package/snowball-init/Config.in | 5 +++-- package/ussp-push/Config.in | 5 +++-- 6 files changed, 20 insertions(+), 10 deletions(-) diff --git a/package/bluez_utils/Config.in b/package/bluez_utils/Config.in index e08e9be..4c93577 100644 --- 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 @@ -38,6 +39,6 @@ config BR2_PACKAGE_BLUEZ_UTILS_USB 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 783a54e..907c7fe 100644 --- 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 9b9d2f9..b52f757 100644 --- 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 58c1e03..b8755c6 100644 --- 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 e6e3272..d633d89 100644 --- 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 4a79779..c8facef 100644 --- 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