Re: [Buildroot] [PATCH v6 2/4] package/webkitgtk: use the CMAKE_NINJA flag

["Yann E. MORIN" <yann.morin.1998@free.fr>]

Thomas, All,

On 2023-08-02 13:14 +0200, Thomas Devoogdt spake thusly:
> 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>

It was weird to read a commit log in a commit log (it really took me a
moment to realise what I was looking at), so I simplified it a bit.

Also, I changed over to the new _CMAKE_BACKEND variable.

> Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com>

Applied to next, thanks.

Regards,
Yann E. MORIN.

> ---
> 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

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot