From patchwork Tue Apr 19 11:43:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Corjon X-Patchwork-Id: 612073 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 3qq38D3Wrqz9t3Z for ; Tue, 19 Apr 2016 21:44:28 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 1E76896477; Tue, 19 Apr 2016 11:44:27 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id oXX9qY+NUYY7; Tue, 19 Apr 2016 11:44:26 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id E786D9644D; Tue, 19 Apr 2016 11:44:25 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 0290D1C0C74 for ; Tue, 19 Apr 2016 11:44:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id EB729886AA for ; Tue, 19 Apr 2016 11:44:10 +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 jLWgQfWNXQ3I for ; Tue, 19 Apr 2016 11:44:09 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by whitealder.osuosl.org (Postfix) with ESMTPS id 8E90886876 for ; Tue, 19 Apr 2016 11:44:09 +0000 (UTC) Received: by mail-wm0-f65.google.com with SMTP id y144so4387898wmd.0 for ; Tue, 19 Apr 2016 04:44:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=0BL9kNwJGWBSkZCNCkocYToodnG014TGSVjhpXQyN4o=; b=JC5Q6zg96a7uUCx0/gOcz0DH+euP6YwuPDd1iTpIde1sydgEfHaIi5WHv3kfZTdv3r atBp40jUF+J3ohJGP+3UEw3Lhlkjm58G//8i+k1gwAdfcVRo8jtYOXzwScjN6Rz16ROX zgbgD6PkVqsCouI3v3Zl65kEZg9F3a+RHGN1fJQLR+cNPfRWb35nTNpVbnXX3wRtwiV9 aehlXgaWH98R5bmIOq4qK7INpRr0CW/rtpKNCnU8slD/pNqVUoSlS9iwsZp4LawtrcjY GOFKeBCsd8iDNMZ5N0u6cdGbrwrEA1Tgp1tzE+De/+D+EWNWUcNA3hSL1YZ5z/7jOG7S EUVA== X-Gm-Message-State: AOPr4FVTvJeVquohNUJsXzleKBnCH98eTZ0RDC01yELxYGu8B7K93Ve1DXYsEnI/qLQGUA== X-Received: by 10.194.90.3 with SMTP id bs3mr2720030wjb.105.1461066248044; Tue, 19 Apr 2016 04:44:08 -0700 (PDT) Received: from mic341-linux.caubios.net ([82.236.247.27]) by smtp.gmail.com with ESMTPSA id hk7sm22405138wjb.5.2016.04.19.04.44.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 19 Apr 2016 04:44:06 -0700 (PDT) From: Julien Corjon To: buildroot@buildroot.org Date: Tue, 19 Apr 2016 13:43:54 +0200 Message-Id: <1461066234-21504-2-git-send-email-corjon.j@ecagroup.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1461066234-21504-1-git-send-email-corjon.j@ecagroup.com> References: <1459763762-31640-2-git-send-email-corjon.j@ecagroup.com> <1461066234-21504-1-git-send-email-corjon.j@ecagroup.com> Cc: software.eca-sinters@ecagroup.com Subject: [Buildroot] [PATCH v2 2/2] qt5connectivity: add bluez5_utils option for QtBluetooth submodule X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 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" Signed-off-by: Julien Corjon --- package/qt5/qt5connectivity/Config.in | 3 ++- package/qt5/qt5connectivity/qt5connectivity.mk | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/qt5/qt5connectivity/Config.in b/package/qt5/qt5connectivity/Config.in index 83df06a..f10d001 100644 --- a/package/qt5/qt5connectivity/Config.in +++ b/package/qt5/qt5connectivity/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_QT5CONNECTIVITY select BR2_PACKAGE_QT5BASE_CONCURRENT select BR2_PACKAGE_QT5BASE_DBUS depends on !BR2_STATIC_LIBS - depends on BR2_PACKAGE_NEARD || BR2_PACKAGE_BLUEZ_UTILS + depends on BR2_PACKAGE_NEARD || BR2_PACKAGE_BLUEZ_UTILS || BR2_PACKAGE_BLUEZ5_UTILS help Qt is a cross-platform application and UI framework for developers using C++. @@ -24,3 +24,4 @@ comment "qt5connectivity need neard and/or bluez_utils" depends on !BR2_STATIC_LIBS depends on !BR2_PACKAGE_NEARD depends on !BR2_PACKAGE_BLUEZ_UTILS + depends on !BR2_PACKAGE_BLUEZ5_UTILS diff --git a/package/qt5/qt5connectivity/qt5connectivity.mk b/package/qt5/qt5connectivity/qt5connectivity.mk index 6a446e9..a95f30f 100644 --- a/package/qt5/qt5connectivity/qt5connectivity.mk +++ b/package/qt5/qt5connectivity/qt5connectivity.mk @@ -20,6 +20,7 @@ endif QT5CONNECTIVITY_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5DECLARATIVE),qt5declarative) QT5CONNECTIVITY_DEPENDENCIES += $(if $(BR2_PACKAGE_BLUEZ_UTILS),bluez_utils) +QT5CONNECTIVITY_DEPENDENCIES += $(if $(BR2_PACKAGE_BLUEZ5_UTILS),bluez5_utils) QT5CONNECTIVITY_DEPENDENCIES += $(if $(BR2_PACKAGE_NEARD),neard) define QT5CONNECTIVITY_CONFIGURE_CMDS @@ -36,7 +37,7 @@ define QT5CONNECTIVITY_INSTALL_STAGING_CMDS endef ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) -ifeq ($(BR2_PACKAGE_BLUEZ_UTILS),y) +ifneq (,$(filter y,$(BR2_PACKAGE_BLUEZ_UTILS) $(BR2_PACKAGE_BLUEZ5_UTILS))) define QT5CONNECTIVITY_INSTALL_TARGET_BLUETOOTH_QMLS cp -dpfr $(STAGING_DIR)/usr/qml/QtBluetooth $(TARGET_DIR)/usr/qml/ endef @@ -52,7 +53,7 @@ define QT5CONNECTIVITY_INSTALL_TARGET_QMLS endef endif -ifeq ($(BR2_PACKAGE_BLUEZ_UTILS),y) +ifneq (,$(filter y,$(BR2_PACKAGE_BLUEZ_UTILS) $(BR2_PACKAGE_BLUEZ5_UTILS))) define QT5CONNECTIVITY_INSTALL_TARGET_BLUETOOTH cp -dpf $(STAGING_DIR)/usr/lib/libQt5Bluetooth.so.* $(TARGET_DIR)/usr/lib cp -dpf $(STAGING_DIR)/usr/bin/sdpscanner $(TARGET_DIR)/usr/bin