From patchwork Wed Mar 6 20:22:58 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 225630 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 760E02C0364 for ; Thu, 7 Mar 2013 07:25:57 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id D1037A0226; Wed, 6 Mar 2013 20:25:57 +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 a1aaZXyQzF5Z; Wed, 6 Mar 2013 20:25:50 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 7D1DAA0334; Wed, 6 Mar 2013 20:24:03 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id B4D898F783 for ; Wed, 6 Mar 2013 20:24:01 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id DE600101CD9 for ; Wed, 6 Mar 2013 20:23:39 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id opvRypJU0T-D for ; Wed, 6 Mar 2013 20:23:35 +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 fraxinus.osuosl.org (Postfix) with ESMTP id 809CA100347 for ; Wed, 6 Mar 2013 20:23:35 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 106) id C093D81D; Wed, 6 Mar 2013 21:23:50 +0100 (CET) Received: from localhost (humanoidz.org [82.247.183.72]) by mail.free-electrons.com (Postfix) with ESMTPSA id A89B47DE for ; Wed, 6 Mar 2013 21:23:49 +0100 (CET) From: Thomas Petazzoni To: buildroot@uclibc.org Date: Wed, 6 Mar 2013 21:22:58 +0100 Message-Id: <1362601396-32250-17-git-send-email-thomas.petazzoni@free-electrons.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1362601396-32250-1-git-send-email-thomas.petazzoni@free-electrons.com> References: <1362601396-32250-1-git-send-email-thomas.petazzoni@free-electrons.com> Subject: [Buildroot] [PATCH 16/34] qt5base: add OpenSSL 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 | 4 +++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/package/qt5/qt5base/Config.in b/package/qt5/qt5base/Config.in index 801ef6f..540c8b2 100644 --- a/package/qt5/qt5base/Config.in +++ b/package/qt5/qt5base/Config.in @@ -33,6 +33,14 @@ config BR2_PACKAGE_QT5BASE_NETWORK help This options enables the Qt5Network library. +config BR2_PACKAGE_QT5BASE_NETWORK_OPENSSL + bool "OpenSSL support" + select BR2_PACKAGE_OPENSSL + depends on BR2_PACKAGE_QT5BASE_NETWORK + help + This option enables the OpenSSL support in the Qt5Network + library. + config BR2_PACKAGE_QT5BASE_CONCURRENT bool "concurrent module" help diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 41e7779..79cbc48 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -28,7 +28,6 @@ QT5BASE_CONFIGURE_OPTS += \ -no-nis \ -no-libudev \ -no-iconv \ - -no-openssl \ -no-fontconfig \ -no-gif \ -no-libpng \ @@ -82,6 +81,9 @@ else QT5_BASE_CONFIGURE_OPTS += -no-xcb endif +QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_OPENSSL),-openssl,-no-openssl) +QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_OPENSSL),openssl) + # Build the list of libraries to be installed on the target QT5BASE_INSTALL_LIBS_y += Qt5Core QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_NETWORK) += Qt5Network