From: Thomas Devoogdt <thomas@devoogdt.com>
To: buildroot@buildroot.org
Cc: Eric Le Bihan <eric.le.bihan.dev@free.fr>,
Samuel Martin <s.martin49@gmail.com>,
Adrian Perez de Castro <aperez@igalia.com>,
Thomas Devoogdt <thomas.devoogdt@barco.com>
Subject: [Buildroot] [PATCH v6 2/4] package/webkitgtk: use the CMAKE_NINJA flag
Date: Wed, 2 Aug 2023 13:14:45 +0200 [thread overview]
Message-ID: <20230802111447.41714-2-thomas@devoogdt.com> (raw)
In-Reply-To: <20230802111447.41714-1-thomas@devoogdt.com>
From: Thomas Devoogdt <thomas.devoogdt@barco.com>
Replaces:
commit 16e5c92ff5fd2b44a1126bd7d7538c68ce838213
Author: Peter Korsgaard <peter@korsgaard.com>
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 <peter@korsgaard.com>
Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com>
---
v5: no change
v6: rebase
---
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 56277a0a0a..aa1c11f7cd 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 host-unifdef \
enchant harfbuzz icu jpeg libgcrypt libgtk3 libsecret libsoup \
libtasn1 libxml2 libxslt openjpeg sqlite webp woff2
@@ -140,23 +141,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.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
next prev parent reply other threads:[~2023-08-02 11:16 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-16 8:21 [Buildroot] [PATCH v5 1/4] pkg-cmake: add option to select the Ninja generator Thomas Devoogdt
2023-05-16 8:21 ` [Buildroot] [PATCH v5 2/4] package/webkitgtk: use the CMAKE_NINJA flag Thomas Devoogdt
2023-05-16 8:21 ` [Buildroot] [PATCH v5 3/4] package/wpewebkit: " Thomas Devoogdt
2023-05-16 8:21 ` [Buildroot] [PATCH v5 4/4] [optional patch] pkg-cmake: make ninja the default for all packages Thomas Devoogdt
2023-08-02 11:14 ` [Buildroot] [PATCH v6 1/4] pkg-cmake: add option to select the Ninja generator Thomas Devoogdt
2023-08-02 11:14 ` Thomas Devoogdt [this message]
2023-08-06 14:16 ` [Buildroot] [PATCH v6 2/4] package/webkitgtk: use the CMAKE_NINJA flag Yann E. MORIN
2023-08-02 11:14 ` [Buildroot] [PATCH v6 3/4] package/wpewebkit: " Thomas Devoogdt
2023-08-06 14:17 ` Yann E. MORIN
2023-08-02 11:14 ` [Buildroot] [PATCH v6 4/4] pkg-cmake: make ninja the default for all packages Thomas Devoogdt
2023-08-06 14:19 ` Yann E. MORIN
2023-08-06 20:54 ` Yann E. MORIN
2023-08-06 14:15 ` [Buildroot] [PATCH v6 1/4] pkg-cmake: add option to select the Ninja generator Yann E. MORIN
2023-10-02 17:33 ` Yann E. MORIN
2023-10-02 20:26 ` Thomas Devoogdt
2023-10-02 20:43 ` Yann E. MORIN
2023-10-07 18:10 ` Thomas Devoogdt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230802111447.41714-2-thomas@devoogdt.com \
--to=thomas@devoogdt.com \
--cc=aperez@igalia.com \
--cc=buildroot@buildroot.org \
--cc=eric.le.bihan.dev@free.fr \
--cc=s.martin49@gmail.com \
--cc=thomas.devoogdt@barco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox