From patchwork Fri Feb 24 11:15:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Devoogdt X-Patchwork-Id: 1747419 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PNS3y2TXBz1yYg for ; Fri, 24 Feb 2023 22:15:26 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 122AF60FD7; Fri, 24 Feb 2023 11:15:24 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 122AF60FD7 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 4JgyyvxQc_-4; Fri, 24 Feb 2023 11:15:23 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id 2A33260FCF; Fri, 24 Feb 2023 11:15:22 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 2A33260FCF X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 3E8371BF36B for ; Fri, 24 Feb 2023 11:15:20 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 25A1181FB5 for ; Fri, 24 Feb 2023 11:15:20 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 25A1181FB5 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id k5Zmd3Xtxd81 for ; Fri, 24 Feb 2023 11:15:19 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 3848381FA4 Received: from mail-wr1-x42b.google.com (mail-wr1-x42b.google.com [IPv6:2a00:1450:4864:20::42b]) by smtp1.osuosl.org (Postfix) with ESMTPS id 3848381FA4 for ; Fri, 24 Feb 2023 11:15:19 +0000 (UTC) Received: by mail-wr1-x42b.google.com with SMTP id l25so13132352wrb.3 for ; Fri, 24 Feb 2023 03:15:19 -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:message-id:date:subject:cc :to:from:sender:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=SI3c+Rv7Wxnfjg/Q6+jMqKfApcy3fvIf/gUVJt7Pi2o=; b=KjK4qyhjQUarVeO9oOsgnWY/Lmr+AFAoXUk/LnXFdD15ZOcxPvVweqIiRyv2omJiD4 n+henunaVZtAoV2lCLZPQhAvD+nc7dU9w4VvD9WEvr5njinat3GEIFjgbUVqO4SbkufS u4mQkAuoypAwEAT3bFx2N2MBIjck4UwgblQ+SpBtPTTuHeBgu/0Ry0psg0Ecz/QP4XYE 9BHQctTIoCNKnfX84ZCw0Yf/r8JnmpJ+JKdn5k/E6Oz1S0oIvqES/ZoPf05Vdb8vZ/Jt Hjh/VPzmA34KQTN+k8/sfDD0DCwkn6QSGRsHmCni16vsuRtRtjLbsU3jc0EgR1uoSFDV CJhA== X-Gm-Message-State: AO0yUKXMcCGIki9CYlHkwjBNJ76n5wR6pW/X2L6lb17pXUDdmYZZkmZt 2DMpTfWPZTFLhyJOzzO5axGXpnN6CCa6XUi8 X-Google-Smtp-Source: AK7set8rlYEv6g3a74PpyuxCtOXt07+5hY4FMqLvbIEXkwp2nxYUuOQHKme8TS+wfAhRSjKfNsyNAw== X-Received: by 2002:a5d:458b:0:b0:2c7:7b3:36c6 with SMTP id p11-20020a5d458b000000b002c707b336c6mr8976467wrq.52.1677237316950; Fri, 24 Feb 2023 03:15:16 -0800 (PST) Received: from thomas-OptiPlex-7090.nmg.localnet (d528f5fc4.static.telenet.be. [82.143.95.196]) by smtp.gmail.com with ESMTPSA id g17-20020a5d6991000000b002c54911f50bsm13537960wru.84.2023.02.24.03.15.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Feb 2023 03:15:16 -0800 (PST) From: Thomas Devoogdt X-Google-Original-From: Thomas Devoogdt To: buildroot@buildroot.org Date: Fri, 24 Feb 2023 12:15:07 +0100 Message-Id: <20230224111509.2434694-1-thomas.devoogdt@barco.com> X-Mailer: git-send-email 2.39.2 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:message-id:date:subject:cc :to:from:sender:from:to:cc:subject:date:message-id:reply-to; bh=SI3c+Rv7Wxnfjg/Q6+jMqKfApcy3fvIf/gUVJt7Pi2o=; b=JnkWtJbNiylvWWCEDM/1Dsjdfpw173iBbmuX+0/FrfijT9xnkwHHgkpYeSvSKtzGSV /GFUdxsxzBApLFSgLp0UZQR7pLTFdiIEDzQCebxP7B96ecx1QvboR3m1gk+H2ft93uk6 DiBG400GZXeCvgmJqtFONmq/EGzCN5VT6ZT0dLiYrfnUZ0kBir8kjJQeQVN9j3jvrPjp PDHR7Shz7meCBKPTtvj/s/a8JnRoZ0nFb6/3iAbV8qgXM2MkSmgRxtJdhV8YNmWKM0dk T/YQKNCGlT5GiGMDY8vYgBqJs6UtmZmr6ImxOXaAnGBEegNy9+mghYPFyjpcPy6Bd37i A+3A== X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=JnkWtJbN Subject: [Buildroot] [PATCH v1 1/3] pkg-cmake: add option to select the Ninja generator 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: Adrian Perez de Castro , Samuel Martin , Thomas Devoogdt Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" E.g. Commit 16e5c92ff5fd2b44a1126bd7d7538c68ce838213, and 78d499409f71d8a22b0632c8ebc06f67ee6ae6dd can now be replaced by: WEBKITGTK_CMAKE_NINJA = YES Packages that are selecting Ninja, should also use the NINJA_{ENV,OPTS} variables iso the MAKE variables. Signed-off-by: Thomas Devoogdt --- package/pkg-cmake.mk | 41 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk index 8c375779cb..4ce3e6bada 100644 --- a/package/pkg-cmake.mk +++ b/package/pkg-cmake.mk @@ -65,6 +65,13 @@ else $(2)_BUILDDIR = $$($(2)_SRCDIR)/buildroot-build endif +ifeq ($$($(3)_CMAKE_NINJA),YES) +$(2)_DEPENDENCIES += host-ninja +$(2)_GENERATOR = "Ninja" +else +$(2)_GENERATOR = "Unix Makefiles" +endif + # # Configure step. Only define it if not already defined by the package # .mk file. And take care of the differences between host and target @@ -88,7 +95,7 @@ define $(2)_CONFIGURE_CMDS rm -f CMakeCache.txt && \ PATH=$$(BR_PATH) \ $$($$(PKG)_CONF_ENV) $$(BR2_CMAKE) $$($$(PKG)_SRCDIR) \ - -G"Unix Makefiles" \ + -G$$($$(PKG)_GENERATOR) \ -DCMAKE_TOOLCHAIN_FILE="$$(HOST_DIR)/share/buildroot/toolchainfile.cmake" \ -DCMAKE_INSTALL_PREFIX="/usr" \ -DCMAKE_INSTALL_RUNSTATEDIR="/run" \ @@ -119,7 +126,7 @@ define $(2)_CONFIGURE_CMDS PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \ $$($$(PKG)_CONF_ENV) $$(BR2_CMAKE) $$($$(PKG)_SRCDIR) \ - -G"Unix Makefiles" \ + -G$$($$(PKG)_GENERATOR) \ -DCMAKE_INSTALL_SO_NO_EXE=0 \ -DCMAKE_FIND_ROOT_PATH="$$(HOST_DIR)" \ -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM="BOTH" \ @@ -165,45 +172,75 @@ $(2)_DEPENDENCIES += $(BR2_CMAKE_HOST_DEPENDENCY) # ifndef $(2)_BUILD_CMDS ifeq ($(4),target) +ifeq ($$($(3)_CMAKE_NINJA),YES) +define $(2)_BUILD_CMDS + $$(TARGET_MAKE_ENV) $$($$(PKG)_NINJA_ENV) $$(NINJA) $$(NINJA_OPTS) $$($$(PKG)_NINJA_OPTS) -C $$($$(PKG)_BUILDDIR) +endef +else define $(2)_BUILD_CMDS $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) -C $$($$(PKG)_BUILDDIR) endef +endif +else +ifeq ($$($(3)_CMAKE_NINJA),YES) +define $(2)_BUILD_CMDS + $$(HOST_MAKE_ENV) $$($$(PKG)_NINJA_ENV) $$(NINJA) $$(NINJA_OPTS) $$($$(PKG)_NINJA_OPTS) -C $$($$(PKG)_BUILDDIR) +endef else define $(2)_BUILD_CMDS $$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) -C $$($$(PKG)_BUILDDIR) endef endif endif +endif # # Host installation step. Only define it if not already defined by the # package .mk file. # ifndef $(2)_INSTALL_CMDS +ifeq ($$($(3)_CMAKE_NINJA),YES) +define $(2)_INSTALL_CMDS + $$(HOST_MAKE_ENV) $$($$(PKG)_NINJA_ENV) $$(NINJA) $$(NINJA_OPTS) -C $$($$(PKG)_BUILDDIR) $$($$(PKG)_INSTALL_OPTS) +endef +else define $(2)_INSTALL_CMDS $$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_OPTS) -C $$($$(PKG)_BUILDDIR) endef endif +endif # # Staging installation step. Only define it if not already defined by # the package .mk file. # ifndef $(2)_INSTALL_STAGING_CMDS +ifeq ($$($(3)_CMAKE_NINJA),YES) +define $(2)_INSTALL_STAGING_CMDS + $$(TARGET_MAKE_ENV) $$($$(PKG)_NINJA_ENV) DESTDIR=$$(STAGING_DIR) $$(NINJA) $$(NINJA_OPTS) -C $$($$(PKG)_BUILDDIR install +endef +else define $(2)_INSTALL_STAGING_CMDS $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_STAGING_OPTS) -C $$($$(PKG)_BUILDDIR) endef endif +endif # # Target installation step. Only define it if not already defined by # the package .mk file. # ifndef $(2)_INSTALL_TARGET_CMDS +ifeq ($$($(3)_CMAKE_NINJA),YES) +define $(2)_INSTALL_TARGET_CMDS + $$(TARGET_MAKE_ENV) $$($$(PKG)_NINJA_ENV) DESTDIR=$$(TARGET_DIR) $$(NINJA) $$(NINJA_OPTS) -C $$($$(PKG)_BUILDDIR) install +endef +else define $(2)_INSTALL_TARGET_CMDS $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_TARGET_OPTS) -C $$($$(PKG)_BUILDDIR) endef endif +endif # Call the generic package infrastructure to generate the necessary # make targets From patchwork Fri Feb 24 11:15:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Devoogdt X-Patchwork-Id: 1747421 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PNS4Q6q06z1yYg for ; Fri, 24 Feb 2023 22:15:50 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 11D1060FCF; Fri, 24 Feb 2023 11:15:49 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 11D1060FCF 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 JohgYAPEvtzY; Fri, 24 Feb 2023 11:15:48 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id 5539060FD2; Fri, 24 Feb 2023 11:15:47 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 5539060FD2 X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 181B51BF36B for ; Fri, 24 Feb 2023 11:15:25 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id E6A0A81FB5 for ; Fri, 24 Feb 2023 11:15:24 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org E6A0A81FB5 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id CsE8-8D1Xuze for ; Fri, 24 Feb 2023 11:15:20 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 92A7081FA4 Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) by smtp1.osuosl.org (Postfix) with ESMTPS id 92A7081FA4 for ; Fri, 24 Feb 2023 11:15:20 +0000 (UTC) Received: by mail-wr1-x436.google.com with SMTP id t15so13645289wrz.7 for ; Fri, 24 Feb 2023 03:15:20 -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=roVbnz8rQlfilecaDMS6kxWOBLY/epwyG0Vwamnx92gwPr6z87iakGrPPrgerbLSTv ynPvUa+NWBONUCPhlLqHVgZt0j/4kHvcMnWszsNSpvbCED4xftSx3qi8Q85QiyqrSDk7 Y/T4tG2V5xcGgg9GGQxHQUdYsdyD8JPpGa+sqKsscXuept0JvafjMwt+sssDLbR1fhV0 apnDzzzEo/mEfPbYC5DES/0IeBXVTQ+lcfNuHiO4kx2yX5YmTyAfBFSha+5WQRB673tv fkmqI3j8PM0o28UofWGUgiTbPMkgn44ka0pbzjY6DOOwnxV4osuLBeghTVNmg448BsAE Nweg== X-Gm-Message-State: AO0yUKV4kIXRPmYXLE2tnBwFxNfZWGiZoDvyKUVgDKKMv/5v3OC68IzK 1RT7ehSj1sKtWMHUrqZ8EiuWQWrMX2RvRb+N X-Google-Smtp-Source: AK7set/Ciw7MCAT9GMlhaaNpmGD2mpGZMcfovG3hJPB1syG5KCMNLDAdtwJFZbM1D1HFXqgz597oRw== X-Received: by 2002:adf:fc46:0:b0:2c7:dec:77a8 with SMTP id e6-20020adffc46000000b002c70dec77a8mr6088602wrs.57.1677237318526; Fri, 24 Feb 2023 03:15:18 -0800 (PST) Received: from thomas-OptiPlex-7090.nmg.localnet (d528f5fc4.static.telenet.be. [82.143.95.196]) by smtp.gmail.com with ESMTPSA id g17-20020a5d6991000000b002c54911f50bsm13537960wru.84.2023.02.24.03.15.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Feb 2023 03:15:18 -0800 (PST) From: Thomas Devoogdt X-Google-Original-From: Thomas Devoogdt To: buildroot@buildroot.org Date: Fri, 24 Feb 2023 12:15:08 +0100 Message-Id: <20230224111509.2434694-2-thomas.devoogdt@barco.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230224111509.2434694-1-thomas.devoogdt@barco.com> References: <20230224111509.2434694-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=AJAujmWmF1a4nkjRZhYf0qgIp1bjbfSId/o81PyWteNma0z32fyYy/Vn4UkeD8GDLW PL90ULlZpFr5ApHtaHYMO5VOKr+NuRJ4Nkv3bteeZKoxAU6A3yCGEk5QrnWzO3F8D+Fr I7oZIc9Vs+81Ai2c4hJepEnfLZoGxg31fno+LmQb/dTA4mbbFCwXVcFIXe+bTjxwjYT7 LOEHbmbOMpFlrMcDAlbFE7pjxK/is4cziiZDpYcrsvrfj7svQX7g3PNRCSl33isTzYd1 Rk4N2VFU7xbxv3tyU6afXtsMPPPLJkoA/83zaPx7V4EGjep7WpWvGXFwtlpu3EXwJK8w anWg== X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=AJAujmWm Subject: [Buildroot] [PATCH v1 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: Adrian Perez de Castro , Samuel Martin , Thomas Devoogdt 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)) From patchwork Fri Feb 24 11:15:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Devoogdt X-Patchwork-Id: 1747420 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PNS4D5bF2z1yYg for ; Fri, 24 Feb 2023 22:15:40 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 225C460FBD; Fri, 24 Feb 2023 11:15:39 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 225C460FBD 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 dyRc2II74Lb8; Fri, 24 Feb 2023 11:15:35 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id B699460FDC; Fri, 24 Feb 2023 11:15:34 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org B699460FDC X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id BB0FA1BF36B for ; Fri, 24 Feb 2023 11:15:24 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id A11F4418E9 for ; Fri, 24 Feb 2023 11:15:24 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org A11F4418E9 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id tiApymZgG2st for ; Fri, 24 Feb 2023 11:15:22 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 59696418E8 Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com [IPv6:2a00:1450:4864:20::432]) by smtp4.osuosl.org (Postfix) with ESMTPS id 59696418E8 for ; Fri, 24 Feb 2023 11:15:22 +0000 (UTC) Received: by mail-wr1-x432.google.com with SMTP id bo30so12977500wrb.0 for ; Fri, 24 Feb 2023 03:15:22 -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=zOZRytoWff018qc3DgyWy0Zv4jvCF0OaRC8LWH449/0=; b=6mn/8TOKyJGFYoVTdm3zkO+B7dSny6TIYy6meILkPLmAF5mPf3v30F6YuH2nQxlJpS zGmMUz0dtdfCaV6RRxWkVnvmnuXWucryW0zBdsmwZmIK1hwyz2isnU7Fbp6UKa2DcQWV TYqNrRuikKh/iHltcsDim+teVF768c42upOrxDi1udCKdTfZO1V0tjbtCqMnjNQFfNh7 1Ah2Mz3agYyeiStqpt06taEbIDv0FQBIfPjF27SoDaQv/nF+HPUDhgQ16wUdK9gBiro0 PvhgbL+ULmJkSywy7vLKIN5nrP6vwh8vmoceNta7CKVEq6bbR2c3X4sZfYF9IimiEoig xEyg== X-Gm-Message-State: AO0yUKV33Zs6fMXtKuXffTy1oalil//1yUIb1e+2vytuFBfmEGlqOSnI XwYndmt7mvV9WSOKKI6vztoh/Zkai8lvRWoS X-Google-Smtp-Source: AK7set8m4RgAQAqKIHDflWVntx6VqMUeUP7oXxyWX5NSPPvkRsnfZpN/UC24u9INrdMjNLOPb9xwzg== X-Received: by 2002:adf:f3ca:0:b0:2c7:832:8fc0 with SMTP id g10-20020adff3ca000000b002c708328fc0mr8824741wrp.3.1677237320094; Fri, 24 Feb 2023 03:15:20 -0800 (PST) Received: from thomas-OptiPlex-7090.nmg.localnet (d528f5fc4.static.telenet.be. [82.143.95.196]) by smtp.gmail.com with ESMTPSA id g17-20020a5d6991000000b002c54911f50bsm13537960wru.84.2023.02.24.03.15.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Feb 2023 03:15:19 -0800 (PST) From: Thomas Devoogdt X-Google-Original-From: Thomas Devoogdt To: buildroot@buildroot.org Date: Fri, 24 Feb 2023 12:15:09 +0100 Message-Id: <20230224111509.2434694-3-thomas.devoogdt@barco.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230224111509.2434694-1-thomas.devoogdt@barco.com> References: <20230224111509.2434694-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=zOZRytoWff018qc3DgyWy0Zv4jvCF0OaRC8LWH449/0=; b=pwEin9TrIqvGDBDGrEnjM5w+dIhR79sZ2RNVCuxOqYh+NzBtV5T57rFdKUBck2GLJb n7xP41N7bJMYOuj1luc6heZdyl9zf9BZPQJXctuR9VOOyBBWmbDFLzllaVS7vy6GCOlJ dYwOyX4GI9D1LiXjOu+2zxixXbcvtiPn9Kr7eKgt+xRsEdAVdlXk7usP+m8zMtChSz94 aJ6xnjsYzzJDud6LSBeQTeZvG4ma8eYGtwC3FM8M8VEPPI7hTdLd6m//54kjx/+T0gKO qPDsx/dWkngKNiCp1K1RRRoPOlnKmgEm+FQzRpg4SLaff9VzInxnhFn5/7Snj3FL1B/g vEhQ== X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=pwEin9Tr Subject: [Buildroot] [PATCH v1 3/3] package/wpewebkit: 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: Adrian Perez de Castro , Samuel Martin , Thomas Devoogdt Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Replaces: commit 78d499409f71d8a22b0632c8ebc06f67ee6ae6dd Author: Peter Korsgaard Date: Thu Feb 9 18:07:06 2023 +0100 package/wpewebkit: Build with ninja Wpewebkit needs cmake >= 3.20 when building with the make backend since wpewebkit 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/wpewebkit/wpewebkit.mk | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk index 48e5c2f8cd..c1b5dee121 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -14,6 +14,7 @@ WPEWEBKIT_LICENSE_FILES = \ Source/WebCore/LICENSE-LGPL-2.1 WPEWEBKIT_CPE_ID_VENDOR = wpewebkit WPEWEBKIT_CPE_ID_PRODUCT = wpe_webkit +WPEWEBKIT_CMAKE_NINJA = YES WPEWEBKIT_DEPENDENCIES = host-gperf host-python3 host-ruby \ harfbuzz cairo icu jpeg libepoxy libgcrypt libgles libsoup libtasn1 \ libpng libxslt openjpeg wayland-protocols webp wpebackend-fdo @@ -103,23 +104,4 @@ ifeq ($(BR2_ARM_CPU_ARMV5)$(BR2_ARM_CPU_ARMV6)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS WPEWEBKIT_CONF_OPTS += -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON -DENABLE_SAMPLING_PROFILER=OFF endif -# wpewebkit needs cmake >= 3.20 when building with the make backend, 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 -WPEWEBKIT_CONF_OPTS += -GNinja -WPEWEBKIT_DEPENDENCIES += host-ninja - -define WPEWEBKIT_BUILD_CMDS - $(TARGET_MAKE_ENV) $(BR2_CMAKE) --build $(WPEWEBKIT_BUILDDIR) -endef - -define WPEWEBKIT_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) DESTDIR=$(STAGING_DIR) $(BR2_CMAKE) --install $(WPEWEBKIT_BUILDDIR) -endef - -define WPEWEBKIT_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) $(BR2_CMAKE) --install $(WPEWEBKIT_BUILDDIR) -endef - $(eval $(cmake-package))