From patchwork Mon Dec 31 15:49:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Francois Perrad X-Patchwork-Id: 1019640 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.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ZTYxo6s4"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43T1wh5VGCz9s2P for ; Tue, 1 Jan 2019 02:50:12 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 01E7786993; Mon, 31 Dec 2018 15:50: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 jXf21FTDADEI; Mon, 31 Dec 2018 15:50:07 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 054028678E; Mon, 31 Dec 2018 15:50:07 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 305CE1BF2EE for ; Mon, 31 Dec 2018 15:50:03 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 2724085CD0 for ; Mon, 31 Dec 2018 15:50:03 +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 yh9oRZ1rZ0VI for ; Mon, 31 Dec 2018 15:50:00 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-ed1-f66.google.com (mail-ed1-f66.google.com [209.85.208.66]) by whitealder.osuosl.org (Postfix) with ESMTPS id 3E37884DCD for ; Mon, 31 Dec 2018 15:49:59 +0000 (UTC) Received: by mail-ed1-f66.google.com with SMTP id h50so22807522ede.5 for ; Mon, 31 Dec 2018 07:49:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ruz6XEsh2htOJ5dI3OiTtdjrJLg68mWN7u+y9XqKwR4=; b=ZTYxo6s4j4ZVs3SYuyF+7cWfGDCWDfLV5gEM0OCGBPgqyanm83z9j5czV1MsmUednJ rCqrcPHVOfxNnstzCU7DNYQ+5O1Eo8qQxAB/1QbZdEGWSBBGGWqm17yftbXNn02BFheI Qi4KzmVVY/LBAUs2iEo2FRuDFMU8FdT1fuUpzfFeTtK3SGQ6rIZWkV7v0l/sgKXvEcpu UcKgClnPdtzl5wh/K9rG3WXr9PMGQ1GR5YRKNgjewCAMpIp6syVk40y23Do6yyEDVdr+ uYsm6RmLmEjhGsclJJzr9C353+kdQbfN8bBXOC3k2/abJxr9l5LexK+f+IqUFxqZWEaW 0qJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ruz6XEsh2htOJ5dI3OiTtdjrJLg68mWN7u+y9XqKwR4=; b=HIDdOPMX5uNJx/wvHjV2qLH+7J4E92REkthjEh+26sGnwycZGmsHh2QxwziXaGaBzx DmV4EhJwrjtIcUC+r+JB5Qf2YfVijBVMPvBcXiXxK3KbGvHlPT6Bu+jpqZGvXPnbZO7d 1XM3OcAbAy7XfoDBlQCEVbuZ8LvqrpSd3qzq5hZyg3TIKF1nt/HymJEO0Nln7aRLAa0m VV5o26MXMEjJEcJF68Zb5YnPx5X2pBtFryVADuYg0f7o1neHVuwklXjvyO3wO3wM+X+U Ao51foeqLubZh4FS7QRXSMaIc8SqaYFsSp1076o7rbiYMWi/N8MdYzVD8zGwysDpG2A2 M2vQ== X-Gm-Message-State: AA+aEWYZ/3lLD8uxkhdKtBNXdl3DgmxPXQWf8HP2to2Odmq+iRhwhUzT f9d07d/csZPHAJmGyWpAqBK1Xbm1 X-Google-Smtp-Source: AFSGD/XbiIOFxZwvuONbXAG7cIV++pNf6mfgr7xB/Bw+LoXSB0nn+ecPga0/q89YAwO+ylD8PjR6Zw== X-Received: by 2002:a17:906:a4cf:: with SMTP id cc15-v6mr27707259ejb.157.1546271397417; Mon, 31 Dec 2018 07:49:57 -0800 (PST) Received: from vb-18.04 (254.7.19.109.rev.sfr.net. [109.19.7.254]) by smtp.gmail.com with ESMTPSA id f35sm31728149edd.80.2018.12.31.07.49.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 31 Dec 2018 07:49:56 -0800 (PST) From: Francois Perrad X-Google-Original-From: Francois Perrad To: buildroot@busybox.net Date: Mon, 31 Dec 2018 16:49:13 +0100 Message-Id: <20181231154915.32660-4-francois.perrad@gadz.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181231154915.32660-1-francois.perrad@gadz.org> References: <20181231154915.32660-1-francois.perrad@gadz.org> Subject: [Buildroot] [PATCH v1 3/5] webkitgtk: remove GTK in WEBKITGTK_ARCH_SUPPORTS* variable names 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: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" there are common for the GTK & WPE ports of WebKit Signed-off-by: Francois Perrad --- package/midori/Config.in | 4 ++-- package/webkitgtk/Config.in | 8 ++++---- package/webkitgtk/webkitgtk.mk | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/midori/Config.in b/package/midori/Config.in index f0767c85f..460fc6fbf 100644 --- a/package/midori/Config.in +++ b/package/midori/Config.in @@ -1,5 +1,5 @@ comment "midori 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_WEBKIT_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP || !BR2_PACKAGE_LIBGTK3 || \ !BR2_HOST_GCC_AT_LEAST_4_8 || !BR2_TOOLCHAIN_GCC_AT_LEAST_6 || \ !BR2_TOOLCHAIN_USES_GLIBC @@ -12,7 +12,7 @@ config BR2_PACKAGE_MIDORI depends on BR2_HOST_GCC_AT_LEAST_4_8 # webkitgtk -> icu depends on BR2_TOOLCHAIN_GCC_AT_LEAST_6 # webkitgtk depends on BR2_TOOLCHAIN_USES_GLIBC # webkitgtk - depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS + depends on BR2_PACKAGE_WEBKIT_ARCH_SUPPORTS # GCR can only be used with the X11 backend select BR2_PACKAGE_GCR if BR2_PACKAGE_LIBGTK3_X11 select BR2_PACKAGE_GRANITE diff --git a/package/webkitgtk/Config.in b/package/webkitgtk/Config.in index 8714677b6..3e5e8d7b6 100644 --- a/package/webkitgtk/Config.in +++ b/package/webkitgtk/Config.in @@ -1,4 +1,4 @@ -config BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS +config BR2_PACKAGE_WEBKIT_ARCH_SUPPORTS bool # ARM needs BLX, so v5t+, BE completely untested so disabled default y if BR2_arm && !BR2_ARM_CPU_ARMV4 @@ -12,7 +12,7 @@ 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 +config BR2_PACKAGE_WEBKIT_ARCH_SUPPORTS_JIT bool # ARM needs NEON for JIT. default y if BR2_ARM_CPU_HAS_NEON @@ -29,7 +29,7 @@ config BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS_JIT default y if BR2_mipsel && BR2_MIPS_CPU_MIPS32R5 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_WEBKIT_ARCH_SUPPORTS depends on !BR2_PACKAGE_LIBGTK3 || !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_USES_GLIBC || \ !BR2_HOST_GCC_AT_LEAST_4_8 || \ @@ -43,7 +43,7 @@ config BR2_PACKAGE_WEBKITGTK depends on BR2_TOOLCHAIN_GCC_AT_LEAST_6 depends on BR2_TOOLCHAIN_USES_GLIBC depends on BR2_PACKAGE_LIBGTK3 - depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS + depends on BR2_PACKAGE_WEBKIT_ARCH_SUPPORTS select BR2_PACKAGE_CAIRO select BR2_PACKAGE_CAIRO_PNG select BR2_PACKAGE_ENCHANT diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index 80daadd15..53d6236ca 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -27,7 +27,7 @@ WEBKITGTK_CONF_OPTS = \ -DUSE_LIBHYPHEN=OFF \ -DUSE_WOFF2=ON -ifeq ($(BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS_JIT),y) +ifeq ($(BR2_PACKAGE_WEBKIT_ARCH_SUPPORTS_JIT),y) WEBKITGTK_CONF_OPTS += -DENABLE_JIT=ON else WEBKITGTK_CONF_OPTS += -DENABLE_JIT=OFF