[Buildroot] [PATCH 1/2] package/pkg-waf.mk: enable definiton of env. variables in every build steps

[Yann E. MORIN]

David, All,

On 2022-07-05 15:44 +0200, David GOUARIN spake thusly:
> It might be necessary for some packages to define environment variables when calling waf build and waf install.
> This is done the same way as the others package types, by defining $(PKG)_MAKE_ENV in .mk.
> 
> Signed-off-by: David GOUARIN <david.gouarin at thalesgroup.com>

Applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
>  package/pkg-waf.mk | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/package/pkg-waf.mk b/package/pkg-waf.mk
> index d546b4a817..e090afa9e6 100644
> --- a/package/pkg-waf.mk
> +++ b/package/pkg-waf.mk
> @@ -75,7 +75,7 @@ endif
>  ifndef $(2)_BUILD_CMDS
>  define $(2)_BUILD_CMDS
>  	cd $$($$(PKG)_SRCDIR) && \
> -	$$(TARGET_MAKE_ENV) $$(HOST_DIR)/bin/python3 $$($(2)_WAF) \
> +	$$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$(HOST_DIR)/bin/python3 $$($(2)_WAF) \
>  		build $$(WAF_OPTS) $$($(2)_BUILD_OPTS) \
>  		$$($(2)_WAF_OPTS)
>  endef
> @@ -88,7 +88,7 @@ endif
>  ifndef $(2)_INSTALL_STAGING_CMDS
>  define $(2)_INSTALL_STAGING_CMDS
>  	cd $$($$(PKG)_SRCDIR) && \
> -	$$(TARGET_MAKE_ENV) $$(HOST_DIR)/bin/python3 $$($(2)_WAF) \
> +	$$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$(HOST_DIR)/bin/python3 $$($(2)_WAF) \
>  		install --destdir=$$(STAGING_DIR) \
>  		$$($(2)_INSTALL_STAGING_OPTS) \
>  		$$($(2)_WAF_OPTS)
> @@ -102,7 +102,7 @@ endif
>  ifndef $(2)_INSTALL_TARGET_CMDS
>  define $(2)_INSTALL_TARGET_CMDS
>  	cd $$($$(PKG)_SRCDIR) && \
> -	$$(TARGET_MAKE_ENV) $$(HOST_DIR)/bin/python3 $$($(2)_WAF) \
> +	$$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$(HOST_DIR)/bin/python3 $$($(2)_WAF) \
>  		install --destdir=$$(TARGET_DIR) \
>  		$$($(2)_INSTALL_TARGET_OPTS) \
>  		$$($(2)_WAF_OPTS)
> -- 
> 2.17.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.  |
'------------------------------^-------^------------------^--------------------'