Re: [Buildroot] [PATCH 1/5] package/pkg-waf.mk: drop bundled waf/waflib when external waf is used

From: "Yann E. MORIN" <yann.morin.1998@free.fr>
To: Peter Korsgaard <peter@korsgaard.com>
Cc: buildroot@buildroot.org
Subject: Re: [Buildroot] [PATCH 1/5] package/pkg-waf.mk: drop bundled waf/waflib when external waf is used
Date: Wed, 8 Feb 2023 20:24:25 +0100	[thread overview]
Message-ID: <20230208192425.GA2677@scaer> (raw)
In-Reply-To: <20230208181933.3925279-1-peter@korsgaard.com>

Peter, All,

On 2023-02-08 19:19 +0100, Peter Korsgaard spake thusly:
> Waf requires that the version of the waf script matches the version of
> waflib, so drop any bundled waf/waflib if _NEEDS_EXTERNAL_WAF is used, as
> otherwise waf errors out with errors like:
> 
> Waf script '2.0.24' and library '1.9.3' do not match
> 
> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
> ---
>  package/pkg-waf.mk | 8 ++++++++
>  1 file changed, 8 insertions(+)
> 
> diff --git a/package/pkg-waf.mk b/package/pkg-waf.mk
> index e090afa9e6..a067e69c9b 100644
> --- a/package/pkg-waf.mk
> +++ b/package/pkg-waf.mk
> @@ -38,6 +38,13 @@ WAF_OPTS = $(if $(VERBOSE),-v) -j $(PARALLEL_JOBS)
>  
>  define inner-waf-package
>  
> +# The version of waflib has to match with the version of waf,
> +# otherwise waf errors out with:
> +# Waf script 'X' and library 'Y' do not match
> +define WAF_PACKAGE_REMOVE_WAF_LIB
> +	$(RM) -fr $(@D)/waf $(@D)/waflib
> +endef
> +
>  # We need host-python3 to run waf
>  $(2)_DEPENDENCIES += host-python3
>  
> @@ -47,6 +54,7 @@ $(2)_NEEDS_EXTERNAL_WAF ?= NO
>  ifeq ($$($(2)_NEEDS_EXTERNAL_WAF),YES)
>  $(2)_DEPENDENCIES += host-waf
>  $(2)_WAF = $$(HOST_DIR)/bin/waf
> +$(2)_PRE_CONFIGURE_HOOKS += WAF_PACKAGE_REMOVE_WAF_LIB

It would make more sense to make that either a post-extract or a
post-patch hook.

Regards,
Yann E. MORIN.

>  else
>  $(2)_WAF ?= ./waf
>  endif
> -- 
> 2.30.2
> 

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