From patchwork Mon Apr 20 15:29:19 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gwenhael Goavec-Merou X-Patchwork-Id: 462810 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id D4F8A1401E7 for ; Tue, 21 Apr 2015 01:27:30 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id C55C992DF9; Mon, 20 Apr 2015 15:27:29 +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 wPBSd2z3Nk7M; Mon, 20 Apr 2015 15:27:28 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 59AF392E10; Mon, 20 Apr 2015 15:27:27 +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 580431C2863 for ; Mon, 20 Apr 2015 15:27:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 5116392E01 for ; Mon, 20 Apr 2015 15:27:21 +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 yj8D6srPT7u2 for ; Mon, 20 Apr 2015 15:27:19 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from smtp2-g21.free.fr (smtp2-g21.free.fr [212.27.42.2]) by whitealder.osuosl.org (Postfix) with ESMTPS id 12D9192DF8 for ; Mon, 20 Apr 2015 15:27:19 +0000 (UTC) Received: from x230.trabucayre.com (unknown [81.56.132.22]) by smtp2-g21.free.fr (Postfix) with ESMTP id 895374B06AD; Mon, 20 Apr 2015 17:24:28 +0200 (CEST) From: Gwenhael Goavec-Merou To: buildroot@busybox.net Date: Mon, 20 Apr 2015 17:29:19 +0200 Message-Id: <1429543759-32207-3-git-send-email-gwenj@trabucayre.com> X-Mailer: git-send-email 2.0.5 In-Reply-To: <1429543759-32207-1-git-send-email-gwenj@trabucayre.com> References: <1429543759-32207-1-git-send-email-gwenj@trabucayre.com> Cc: Thomas Petazzoni , Gwenhael Goavec-Merou , "Yann E. MORIN" Subject: [Buildroot] [PATCH 3/3] qt: fix webkit dependencies 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" From: Gwenhael Goavec-Merou qtwebkit includes qscript headers. For packages like python-pyqt if webkit is available but not qscript, the compilation fails with : buildroot/output/build/python-pyqt-4.11.3/sip/QtWebKit/qwebframe.sip:79:0: ../../../host/usr/i686-buildroot-linux-gnu/sysroot/usr/include/QtWebKit/qwebframe.h:28:36: fatal error: QtScript/qscriptengine.h: No such file or directory This problem is not seen with Qt compilation because some relative include directly from sources are added. Signed-off-by: Gwenhael Goavec-Merou --- package/qt/Config.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/qt/Config.in b/package/qt/Config.in index 43f5a0f..f6ca054 100644 --- a/package/qt/Config.in +++ b/package/qt/Config.in @@ -417,6 +417,7 @@ config BR2_PACKAGE_QT_ARCH_SUPPORTS_WEBKIT config BR2_PACKAGE_QT_WEBKIT bool "WebKit Module" + depends on BR2_PACKAGE_QT_SCRIPT depends on BR2_PACKAGE_QT_SHARED depends on BR2_PACKAGE_QT_GUI_MODULE depends on BR2_PACKAGE_QT_NETWORK @@ -427,7 +428,8 @@ config BR2_PACKAGE_QT_WEBKIT If unsure, say n. comment "WebKit needs shared library/NPTL toolchain/gui/network support" - depends on !(BR2_PACKAGE_QT_SHARED && BR2_PACKAGE_QT_GUI_MODULE && BR2_PACKAGE_QT_NETWORK) + depends on !(BR2_PACKAGE_QT_SCRIPT && BR2_PACKAGE_QT_SHARED && \ + BR2_PACKAGE_QT_GUI_MODULE && BR2_PACKAGE_QT_NETWORK) depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_PACKAGE_QT_ARCH_SUPPORTS_WEBKIT