From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from smtp3.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 smtp.lore.kernel.org (Postfix) with ESMTPS id A1169C6FA8E for ; Tue, 28 Feb 2023 15:55:55 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 55170611BC; Tue, 28 Feb 2023 15:55:55 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 55170611BC X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id BkowqBr6yFgP; Tue, 28 Feb 2023 15:55:54 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id 7356C61186; Tue, 28 Feb 2023 15:55:53 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 7356C61186 Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 526A01BF2AA for ; Tue, 28 Feb 2023 15:55:41 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 2C188400F3 for ; Tue, 28 Feb 2023 15:55:41 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 2C188400F3 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 1xiRN19uIpCP for ; Tue, 28 Feb 2023 15:55:40 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 167FB400E7 Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) by smtp2.osuosl.org (Postfix) with ESMTPS id 167FB400E7 for ; Tue, 28 Feb 2023 15:55:40 +0000 (UTC) Received: by mail-wm1-x334.google.com with SMTP id j19-20020a05600c191300b003eb3e1eb0caso5251934wmq.1 for ; Tue, 28 Feb 2023 07:55:39 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=pndoObDs60jdvkW70d4FUP2PDQVPqA3KQR+emeoHNLE=; b=6oJMcWvYlbGIOq1105fYbyIqZ6D4Y0GBWI553jIcnEE1NuCOpgcn1DDxmP314+W+OH qe1A2tpXkHmtHrgeB54PRuEnL3XiZE5FgmKScg2v+5h0TVY2ZQOynWtQPx2wB9arcxR7 2kXfhaqM0081z75pK5m1cxKEZr5z2gUQEWqgctftT1gsWlfDCtXyU+yHnejeYRNcUilX 1x6q2nQbsKCZBMhkjue++2D4UlhqPi/UWskEIu1qqP0faDFq4/7NcCWJCigY2anObYNx L01Ac3jF5z7IJxGsaa8sAqluTfAQkIMj1yPP3nZxuJsdRhz1sn1utuOFAF8VigNT2Ula KF6A== X-Gm-Message-State: AO0yUKVVud0eqDYRMMAEczKQhg/XUeJxGbQpcPHTp1WO05Px7ilMJiPb 3bRWy2AWoc1WrSTYAsKtiK2m5kM3Y39qNA== X-Google-Smtp-Source: AK7set+LRhr8yLJdA7Fe2myHo4FHEGO6/fBlXmbIeB/88rFcHcrxIkQOhArQ5eG1KWZngjA4wyi7Cg== X-Received: by 2002:a05:600c:43d4:b0:3e2:147f:ac16 with SMTP id f20-20020a05600c43d400b003e2147fac16mr2455216wmn.10.1677599737954; Tue, 28 Feb 2023 07:55:37 -0800 (PST) Received: from thomas-OptiPlex-7090.nmg.localnet (d528f5fc4.static.telenet.be. [82.143.95.196]) by smtp.gmail.com with ESMTPSA id n17-20020a05600c4f9100b003e876122dc1sm17478968wmq.47.2023.02.28.07.55.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Feb 2023 07:55:37 -0800 (PST) From: Thomas Devoogdt X-Google-Original-From: Thomas Devoogdt To: buildroot@buildroot.org Date: Tue, 28 Feb 2023 16:55:27 +0100 Message-Id: <20230228155528.2430203-2-thomas.devoogdt@barco.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230228155528.2430203-1-thomas.devoogdt@barco.com> References: <20230228155528.2430203-1-thomas.devoogdt@barco.com> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=pndoObDs60jdvkW70d4FUP2PDQVPqA3KQR+emeoHNLE=; b=WklCCcZPtsE+ACWfvprV4VTyCvi0rohSVz/eSQ02PPk58Y36UXu6E/siF/eCp4V9IB ViB9V094B3ggro2dQobKu61Xrw4GuMIBqtAGYS2d5v6faZdLj1yueeB/4ernvPUxtq7z NmtDbDTXR7mnV0SRastPc3rto0yOa92lZimUL9adw/k61q0QH8P1e5Yj3MvRyLEsbbZn /twhzv+YvCTiPTL8YEj8CftoBqu7jkBbEtt/az8asJDyh6Ibb5C7RqaeRvkFz9E+C59D /dZi9diDFyar0hqUK9hrxgbByKX9pXrd6cVwb2n+7Y6t2guVf8lz50s6QJyfqryepvRr VQcw== X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=WklCCcZP Subject: [Buildroot] [PATCH v3 2/3] package/webkitgtk: use the CMAKE_NINJA flag X-BeenThere: buildroot@buildroot.org 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: Thomas Devoogdt , Samuel Martin , John Keeping , Thomas Devoogdt , Thomas Petazzoni , Adrian Perez de Castro , Fabrice Fontaine Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Replaces: commit 16e5c92ff5fd2b44a1126bd7d7538c68ce838213 Author: Peter Korsgaard Date: Thu Feb 9 18:07:05 2023 +0100 package/webkitgtk: Build with ninja Webkitgtk needs cmake >= 3.20 when building with the make backend since webkitgtk 3.8.0. Cmake 3.20 is above our minimal version in support/dependencies/check-host-cmake.mk, so this breaks builds on hosts with cmake >= 3.18 < 3.20 - So use the ninja backend instead. https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Devoogdt --- package/webkitgtk/webkitgtk.mk | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index 3263f7fea0..b43f97f0ca 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -13,6 +13,7 @@ WEBKITGTK_LICENSE_FILES = \ Source/WebCore/LICENSE-APPLE \ Source/WebCore/LICENSE-LGPL-2.1 WEBKITGTK_CPE_ID_VENDOR = webkitgtk +WEBKITGTK_CMAKE_NINJA = YES WEBKITGTK_DEPENDENCIES = host-ruby host-python3 host-gperf \ enchant harfbuzz icu jpeg libgcrypt libgtk3 libsecret libsoup \ libtasn1 libxml2 libxslt openjpeg sqlite webp woff2 @@ -139,23 +140,4 @@ ifeq ($(BR2_ARM_CPU_ARMV5)$(BR2_ARM_CPU_ARMV6)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS WEBKITGTK_CONF_OPTS += -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON -DENABLE_SAMPLING_PROFILER=OFF endif -# webkitgtk needs cmake >= 3.20 when not building with ninja, which is -# above our minimal version in -# support/dependencies/check-host-cmake.mk, so use the ninja backend: -# https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f -WEBKITGTK_CONF_OPTS += -GNinja -WEBKITGTK_DEPENDENCIES += host-ninja - -define WEBKITGTK_BUILD_CMDS - $(TARGET_MAKE_ENV) $(BR2_CMAKE) --build $(WEBKITGTK_BUILDDIR) -endef - -define WEBKITGTK_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) DESTDIR=$(STAGING_DIR) $(BR2_CMAKE) --install $(WEBKITGTK_BUILDDIR) -endef - -define WEBKITGTK_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) $(BR2_CMAKE) --install $(WEBKITGTK_BUILDDIR) -endef - $(eval $(cmake-package)) -- 2.39.2 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot