From patchwork Tue Oct 9 22:08:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Perez de Castro X-Patchwork-Id: 981538 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=igalia.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=igalia.com header.i=@igalia.com header.b="k/H+bVL6"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42VBKl20v0z9s8r for ; Wed, 10 Oct 2018 09:12:11 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 45F13214EE; Tue, 9 Oct 2018 22:12:09 +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 P+DihI9TYCZf; Tue, 9 Oct 2018 22:12:06 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 4629921549; Tue, 9 Oct 2018 22:12:06 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 923F71BFDB9 for ; Tue, 9 Oct 2018 22:12:03 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 8FCF686106 for ; Tue, 9 Oct 2018 22:12:03 +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 1I1rGiejffWl for ; Tue, 9 Oct 2018 22:12:02 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from fanzine.igalia.com (fanzine.igalia.com [91.117.99.155]) by hemlock.osuosl.org (Postfix) with ESMTPS id 85510852CA for ; Tue, 9 Oct 2018 22:12:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=eZra+V5wxgDnBoKe9u+mOwM9fUUSuvQUtsEjTVpC8FQ=; b=k/H+bVL6EHpQUASBXOoHxfR6tH6umwkjnD0RTlfCqx5rRHnP+7hs0t3B12s0WjU1MMiT1ElFu5AAEOx4UDGM0N0t4hufF80QfXiXWwyWwSI9bLKNleHUw08W+0cK2eIojHOK2J2Ne668exzFNuu16+hKYgt3yY44PPhh++LdRSDLPtIISxyhTnT1QG/9pf33uE8wO7hPKk6w/Y6r91CVDjF7P20knrDTPVWQBKI4qT9tbfNgnsksSB5xK6507Lh8Nq9lz55VXkrC7pHqd7Yi+kw1dEMIYW3cRIHNvoKgUD5c/BAErBddnglt6JXKtSNG/8N/36qlV5ZlbTFB6/OI8A==; Received: from [194.100.51.2] (helo=kodama) by fanzine.igalia.com with esmtpsa (Cipher TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim) id 1gA0ES-0004Tv-Jv; Wed, 10 Oct 2018 00:12:00 +0200 Received: from localhost (kodama [local]) by kodama (OpenSMTPD) with ESMTPA id 40a9648c; Tue, 9 Oct 2018 22:08:52 +0000 (UTC) From: Adrian Perez de Castro To: buildroot@buildroot.org Date: Wed, 10 Oct 2018 01:08:49 +0300 Message-Id: <20181009220852.4309-2-aperez@igalia.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181009220852.4309-1-aperez@igalia.com> References: <20181009220852.4309-1-aperez@igalia.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/4] webkitgtk: move JSC JIT selection logic to kconfig X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Adrian Perez de Castro Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This is done in preparation to enable the JavaScriptCore JIT support for more platforms. Having the logic in Config.in scales better than checking in the .mk file. Signed-off-by: Adrian Perez de Castro --- package/webkitgtk/Config.in | 8 ++++++++ package/webkitgtk/webkitgtk.mk | 4 +--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/package/webkitgtk/Config.in b/package/webkitgtk/Config.in index 96a7ab0c94..6933248bd6 100644 --- a/package/webkitgtk/Config.in +++ b/package/webkitgtk/Config.in @@ -11,6 +11,14 @@ config BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt +config BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS_JIT + bool + # ARM needs NEON for JIT. + default y if BR2_ARM_CPU_HAS_NEON + # i386 & x86_64 don't have any special requirements. + default y if BR2_i386 + default y if BR2_x86_64 + comment "webkitgtk needs libgtk3 and a glibc toolchain w/ C++, gcc >= 6, host gcc >= 4.8" depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS depends on !BR2_PACKAGE_LIBGTK3 || !BR2_INSTALL_LIBSTDCPP || \ diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index f28417ac73..39d681b1d4 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -27,9 +27,7 @@ WEBKITGTK_CONF_OPTS = \ -DUSE_LIBNOTIFY=OFF \ -DUSE_LIBHYPHEN=OFF -# ARM needs NEON for JIT -# i386 & x86_64 don't seem to have any special requirements -ifeq ($(BR2_ARM_CPU_HAS_NEON)$(BR2_i386)$(BR2_x86_64),y) +ifeq ($(BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS_JIT),y) WEBKITGTK_CONF_OPTS += -DENABLE_JIT=ON else WEBKITGTK_CONF_OPTS += -DENABLE_JIT=OFF