From patchwork Mon Feb 18 17:17:19 2019 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: 1044194 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.137; helo=fraxinus.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="dJ2ERXCJ"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4439YB68J0z9sDX for ; Tue, 19 Feb 2019 04:17:50 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id BFD6C8531D; Mon, 18 Feb 2019 17:17:45 +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 j7QCuqvDlhe6; Mon, 18 Feb 2019 17:17:44 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 1A3D5853C3; Mon, 18 Feb 2019 17:17:44 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id C7A5A1BF2A0 for ; Mon, 18 Feb 2019 17:17:41 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id C50C82273B for ; Mon, 18 Feb 2019 17:17:41 +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 Cs6A4efwAwj9 for ; Mon, 18 Feb 2019 17:17:40 +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 silver.osuosl.org (Postfix) with ESMTPS id 3C48321563 for ; Mon, 18 Feb 2019 17:17:39 +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:To:From; bh=F8BhHpy27AeAhSJWORR3sA+IVMuuCG3Zn/8+eUq4qIM=; b=dJ2ERXCJqauPU7dcF9hvrXxuChH+s7mMipABrCSfs7huT1AubJdUiC1v2Bm+n0UmMxihtkwldyZQj8T7Ae/m6vR5xWxk9dug36BYUCzcrsdoatbt6ZoaMXJ+ukA0FNZhpqZdILzuOQkuyrS3sob+3RdPfv5m6dvv5c8UbI+UmwjfcYy99fieXVbZzFhM4MI95dQmmcpU9720hcxm1qXGxBhqtgCQHNtGQhzO1pDDso/jgf1VRiuh1mEhKKJF7+0Mu+pdB8RZgRBv3c5l8HTBt0+hSpeaR+MIgBN5DItOhiYVu8P4N1wgTZCYdRxi/VAlN6xNH6Y3v6yNRrqGKCbwEg==; Received: from 62-165-147-230.co.dnainternet.fi ([62.165.147.230] helo=kodama) by fanzine.igalia.com with esmtpsa (Cipher TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim) id 1gvmXw-0003Ev-W6 for ; Mon, 18 Feb 2019 18:17:37 +0100 Received: from localhost (kodama [local]) by kodama (OpenSMTPD) with ESMTPA id c2bce001 for ; Mon, 18 Feb 2019 17:17:19 +0000 (UTC) From: Adrian Perez de Castro To: buildroot@buildroot.org Date: Mon, 18 Feb 2019 19:17:19 +0200 Message-Id: <20190218171719.18721-5-aperez@igalia.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190218171719.18721-1-aperez@igalia.com> References: <20190218171719.18721-1-aperez@igalia.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH RFC/next 4/4] package/webkit: factor out check for woff2 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: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Usage of woff2 os configurable at build time for both wpewebkit and webkitgtk. Signed-off-by: Adrian Perez de Castro --- package/webkit/webkit.mk | 7 +++++++ package/webkit/webkitgtk/webkitgtk.mk | 5 ++--- package/webkit/wpewebkit/wpewebkit.mk | 7 ------- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/package/webkit/webkit.mk b/package/webkit/webkit.mk index 96ca7a109d..8dda16854a 100644 --- a/package/webkit/webkit.mk +++ b/package/webkit/webkit.mk @@ -18,4 +18,11 @@ else WEBKIT_CONF_OPTS += -DENABLE_JIT=OFF endif +ifeq ($(BR2_PACKAGE_WOFF2),y) +WEBKIT_CONF_OPTS += -DUSE_WOFF2=ON +WEBKIT_DEPENDENCIES += woff2 +else +WEBKIT_CONF_OPTS += -DUSE_WOFF2=OFF +endif + include $(sort $(wildcard package/webkit/*/*.mk)) diff --git a/package/webkit/webkitgtk/webkitgtk.mk b/package/webkit/webkitgtk/webkitgtk.mk index fefb52eeaa..3009249762 100644 --- a/package/webkit/webkitgtk/webkitgtk.mk +++ b/package/webkit/webkitgtk/webkitgtk.mk @@ -13,7 +13,7 @@ WEBKITGTK_LICENSE_FILES = \ Source/WebCore/LICENSE-APPLE \ Source/WebCore/LICENSE-LGPL-2.1 WEBKITGTK_DEPENDENCIES = $(WEBKIT_DEPENDENCIES) \ - enchant libgtk3 libsecret woff2 + enchant libgtk3 libsecret WEBKITGTK_CONF_OPTS = \ $(WEBKIT_CONF_OPTS) -DENABLE_GEOLOCATION=OFF \ @@ -21,8 +21,7 @@ WEBKITGTK_CONF_OPTS = \ -DENABLE_SPELLCHECK=ON \ -DPORT=GTK \ -DUSE_LIBNOTIFY=OFF \ - -DUSE_LIBHYPHEN=OFF \ - -DUSE_WOFF2=ON + -DUSE_LIBHYPHEN=OFF ifeq ($(BR2_PACKAGE_WEBKITGTK_MULTIMEDIA),y) WEBKITGTK_CONF_OPTS += \ diff --git a/package/webkit/wpewebkit/wpewebkit.mk b/package/webkit/wpewebkit/wpewebkit.mk index e36dadd359..b8f35e605c 100644 --- a/package/webkit/wpewebkit/wpewebkit.mk +++ b/package/webkit/wpewebkit/wpewebkit.mk @@ -43,11 +43,4 @@ else WPEWEBKIT_CONF_OPTS += -DENABLE_WEBDRIVER=OFF endif -ifeq ($(BR2_PACKAGE_WOFF2),y) -WPEWEBKIT_CONF_OPTS += -DUSE_WOFF2=ON -WPEWEBKIT_DEPENDENCIES += woff2 -else -WPEWEBKIT_CONF_OPTS += -DUSE_WOFF2=OFF -endif - $(eval $(cmake-package))