From patchwork Sat Nov 2 16:17:03 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 288013 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 27BBE2C0109 for ; Sun, 3 Nov 2013 03:17:10 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 6AD8193BBD; Sat, 2 Nov 2013 16:17:09 +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 FMjGSI6L1b26; Sat, 2 Nov 2013 16:17:09 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id D42C293BA3; Sat, 2 Nov 2013 16:17:08 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 5C7F11C2821 for ; Sat, 2 Nov 2013 16:17:07 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 545CB32D00 for ; Sat, 2 Nov 2013 16:17:07 +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 kEsiYkIVj3ZM for ; Sat, 2 Nov 2013 16:17:06 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail.free-electrons.com (top.free-electrons.com [176.31.233.9]) by silver.osuosl.org (Postfix) with ESMTP id AA902328A8 for ; Sat, 2 Nov 2013 16:17:06 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 106) id 55F26860; Sat, 2 Nov 2013 17:17:11 +0100 (CET) Received: from localhost (AToulouse-651-1-1-143.w92-149.abo.wanadoo.fr [92.149.56.143]) by mail.free-electrons.com (Postfix) with ESMTPSA id 0C7F57FD for ; Sat, 2 Nov 2013 17:17:11 +0100 (CET) From: Thomas Petazzoni To: buildroot@uclibc.org Date: Sat, 2 Nov 2013 17:17:03 +0100 Message-Id: <1383409024-17839-1-git-send-email-thomas.petazzoni@free-electrons.com> X-Mailer: git-send-email 1.8.1.2 Subject: [Buildroot] [PATCH 1/2] qt: remove the BR2_PACKAGE_QT_JAVASCRIPTCORE option 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 The BR2_PACKAGE_QT_JAVASCRIPTCORE option was incorrectly used in Buildroot: it's help text and name was pretending it's here to enable/disable the JavaScriptCore, but what it did in fact is force enable or force disable the usage of the JIT mechanism for the JavaScript support in Qt. However, the JIT mechanism is architecture-specific, and therefore not available for all architectures, and Qt already knows on which architectures it is appropriate to enable JIT and on which architectures it is not. Therefore, this commit simply removes the BR2_PACKAGE_QT_JAVASCRIPTCORE option. We don't add it to Config.in.legacy, because the feature is still available, it's just that Qt will know automatically decide whether JIT should be used or not. Fixes: http://autobuild.buildroot.org/results/aae/aaeb82753b7654eeca679ded5d0211ceebda3ea2/build-end.log http://autobuild.buildroot.org/results/367/3670e4f03ff0ce114c90bd7139243d82c427b52a/build-end.log Signed-off-by: Thomas Petazzoni --- package/qt/Config.in | 6 ------ package/qt/qt.mk | 6 ------ 2 files changed, 12 deletions(-) diff --git a/package/qt/Config.in b/package/qt/Config.in index 8801308..74b9461 100644 --- a/package/qt/Config.in +++ b/package/qt/Config.in @@ -356,12 +356,6 @@ config BR2_PACKAGE_QT_WEBKIT comment "WebKit needs shared library/gui/network support" depends on !(BR2_PACKAGE_QT_SHARED && BR2_PACKAGE_QT_GUI_MODULE && BR2_PACKAGE_QT_NETWORK) -config BR2_PACKAGE_QT_JAVASCRIPTCORE - bool "JavaScriptCore JIT compiler" - help - Build the JavaScriptCore JIT compiler - If unsure, say y - config BR2_PACKAGE_QT_STL bool "STL support" help diff --git a/package/qt/qt.mk b/package/qt/qt.mk index 48d39fc..82ce51d 100644 --- a/package/qt/qt.mk +++ b/package/qt/qt.mk @@ -415,12 +415,6 @@ else QT_CONFIGURE_OPTS += -no-scripttools endif -ifeq ($(BR2_PACKAGE_QT_JAVASCRIPTCORE),y) -QT_CONFIGURE_OPTS += -javascript-jit -else -QT_CONFIGURE_OPTS += -no-javascript-jit -endif - ifeq ($(BR2_PACKAGE_QT_STL),y) QT_CONFIGURE_OPTS += -stl else