From patchwork Thu Mar 7 20:18:44 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 225912 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 364C92C038E for ; Fri, 8 Mar 2013 07:20:10 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id EE2CE3122A; Thu, 7 Mar 2013 20:20:08 +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 6wV6SCIy7RHn; Thu, 7 Mar 2013 20:20:05 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 06DD83128A; Thu, 7 Mar 2013 20:20:03 +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 D4A378F74B for ; Thu, 7 Mar 2013 20:19:58 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 283D68BEA6 for ; Thu, 7 Mar 2013 20:19:51 +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 qo-RRePjOnu1 for ; Thu, 7 Mar 2013 20:19:50 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail.free-electrons.com (mail.free-electrons.com [94.23.35.102]) by whitealder.osuosl.org (Postfix) with ESMTP id 3E1198BC93 for ; Thu, 7 Mar 2013 20:19:50 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 106) id BAED4B5D; Thu, 7 Mar 2013 21:19:51 +0100 (CET) Received: from localhost (humanoidz.org [82.247.183.72]) by mail.free-electrons.com (Postfix) with ESMTPSA id 1C21E7B7 for ; Thu, 7 Mar 2013 21:19:51 +0100 (CET) From: Thomas Petazzoni To: buildroot@uclibc.org Date: Thu, 7 Mar 2013 21:18:44 +0100 Message-Id: <1362687540-19440-17-git-send-email-thomas.petazzoni@free-electrons.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1362687540-19440-1-git-send-email-thomas.petazzoni@free-electrons.com> References: <1362687540-19440-1-git-send-email-thomas.petazzoni@free-electrons.com> Subject: [Buildroot] [PATCH 16/32] qt5base: add D-Bus support 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: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Signed-off-by: Thomas Petazzoni --- package/qt5/qt5base/Config.in | 8 ++++++++ package/qt5/qt5base/qt5base.mk | 6 +++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/package/qt5/qt5base/Config.in b/package/qt5/qt5base/Config.in index 08e3c16..baf471f 100644 --- a/package/qt5/qt5base/Config.in +++ b/package/qt5/qt5base/Config.in @@ -140,4 +140,12 @@ config BR2_PACKAGE_QT5BASE_PNG endif +config BR2_PACKAGE_QT5BASE_DBUS + bool "DBus module" + select BR2_PACKAGE_DBUS + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_USE_MMU + help + This option enables the D-Bus module. + endif diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index e2f9d4e..e5a04f8 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -27,7 +27,6 @@ QT5BASE_CONFIGURE_OPTS += \ -no-libudev \ -no-iconv \ -no-icu \ - -no-dbus \ -no-gstreamer \ -no-gtkstyle \ -system-zlib \ @@ -93,6 +92,9 @@ QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_JPEG),jpeg) QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_PNG),-system-libpng,-no-libpng) QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_PNG),libpng) +QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_DBUS),-dbus,-no-dbus) +QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_DBUS),dbus) + # Build the list of libraries to be installed on the target QT5BASE_INSTALL_LIBS_y += Qt5Core QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_NETWORK) += Qt5Network @@ -105,6 +107,8 @@ QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_GUI) += Qt5Gui QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_WIDGETS) += Qt5Widgets QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_PRINTSUPPORT) += Qt5PrintSupport +QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_DBUS) += Qt5DBus + # Ideally, we could use -device-option to substitute variable values # in our linux-buildroot-g++/qmake.config, but this mechanism doesn't # nicely support variable values that contain spaces. So we use the