[Buildroot] [PATCH v6 3/4] package/wpewebkit: use the CMAKE_NINJA flag

[Yann E. MORIN]

Thomas, All,

On 2023-08-02 13:14 +0200, Thomas Devoogdt spake thusly:
> From: Thomas Devoogdt <thomas.devoogdt at barco.com>
> 
> Replaces:
> 
> commit 78d499409f71d8a22b0632c8ebc06f67ee6ae6dd
> Author: Peter Korsgaard <peter at korsgaard.com>
> 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 <peter at korsgaard.com>

Ditto the commit log and variable.

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

Applied to next, thanks.

Regards,
Yann E. MORIN.

> ---
> v5: no change
> v6: rebase
> ---
>  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 c13a7201e6..135db02b44 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 host-unifdef \
>  	harfbuzz cairo icu jpeg libepoxy libgcrypt libgles libsoup libtasn1 \
>  	libpng libxslt openjpeg wayland-protocols webp wpebackend-fdo
> @@ -104,23 +105,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))
> -- 
> 2.34.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot at 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.  |
'------------------------------^-------^------------------^--------------------'