From mboxrd@z Thu Jan  1 00:00:00 1970
From: Yann E. MORIN <yann.morin.1998@free.fr>
Date: Thu, 6 Aug 2020 22:42:56 +0200
Subject: [Buildroot] [PATCH 1/2] package/pkg-kconfig: Support custom
 $(MAKE)
In-Reply-To: <20200804190005.114872-1-brandon.maier@rockwellcollins.com>
References: <20200804190005.114872-1-brandon.maier@rockwellcollins.com>
Message-ID: <20200806204256.GH2186@scaer>
List-Id: <buildroot.busybox.net>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: buildroot@busybox.net

Brandon, All,

On 2020-08-04 14:00 -0500, Brandon Maier spake thusly:
> The U-Boot package requires GNU Make v4.0 or later, and so all U-Boot
> "make" commands must use "$(BR2_MAKE)" so they use the host-make
> package. Currently pkg-kconfig is hardcoded to uses $(MAKE), so add a
> way to support $(BR2_MAKE). The package infra for pkg-automake and
> pkg-cmake have a similar problem, and they solved it by defining a
> $(PKG)_MAKE variable, and allowing each package to override it.
> 
> Signed-off-by: Brandon Maier <brandon.maier@rockwellcollins.com>

Both applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
>  package/pkg-kconfig.mk | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/package/pkg-kconfig.mk b/package/pkg-kconfig.mk
> index 9d65b21ec5..45faf50e71 100644
> --- a/package/pkg-kconfig.mk
> +++ b/package/pkg-kconfig.mk
> @@ -33,7 +33,7 @@ PKG_KCONFIG_COMMON_OPTS = \
>  # Macro to save the defconfig file
>  # $(1): the name of the package in upper-case letters
>  define kconfig-package-savedefconfig
> -	$($(1)_MAKE_ENV) $(MAKE) -C $($(1)_DIR) \
> +	$($(1)_MAKE_ENV) $($(1)_MAKE) -C $($(1)_DIR) \
>  		$(PKG_KCONFIG_COMMON_OPTS) $($(1)_KCONFIG_OPTS) savedefconfig
>  endef
>  
> @@ -89,6 +89,7 @@ $(2)_DEPENDENCIES += $$($(2)_KCONFIG_DEPENDENCIES)
>  $(call inner-generic-package,$(1),$(2),$(3),$(4))
>  
>  # Default values
> +$(2)_MAKE ?= $$(MAKE)
>  $(2)_KCONFIG_EDITORS ?= menuconfig
>  $(2)_KCONFIG_OPTS ?=
>  $(2)_KCONFIG_FIXUP_CMDS ?=
> @@ -122,7 +123,7 @@ $$($(2)_KCONFIG_FILE) $$($(2)_KCONFIG_FRAGMENT_FILES): | $(1)-patch
>  	done
>  
>  $(2)_KCONFIG_MAKE = \
> -	$$($(2)_MAKE_ENV) $$(MAKE) -C $$($(2)_DIR) \
> +	$$($(2)_MAKE_ENV) $$($(2)_MAKE) -C $$($(2)_DIR) \
>  		$$(PKG_KCONFIG_COMMON_OPTS) $$($(2)_KCONFIG_OPTS)
>  
>  # $(2)_KCONFIG_MAKE may already rely on shell expansion. As the $() syntax
> @@ -226,7 +227,7 @@ $(2)_CONFIGURATOR_MAKE_ENV = \
>  $$(addprefix $(1)-,$$($(2)_KCONFIG_EDITORS)): $(1)-%: $$($(2)_DIR)/.kconfig_editor_%
>  $$($(2)_DIR)/.kconfig_editor_%: PKG=$(2)
>  $$($(2)_DIR)/.kconfig_editor_%: $$($(2)_DIR)/.stamp_kconfig_fixup_done
> -	$$($(2)_CONFIGURATOR_MAKE_ENV) $$(MAKE) -C $$($(2)_DIR) \
> +	$$($(2)_CONFIGURATOR_MAKE_ENV) $$($(2)_MAKE) -C $$($(2)_DIR) \
>  		$$(PKG_KCONFIG_COMMON_OPTS) $$($(2)_KCONFIG_OPTS) $$(*)
>  	rm -f $$($(2)_DIR)/.stamp_{kconfig_fixup_done,configured,built}
>  	rm -f $$($(2)_DIR)/.stamp_{target,staging,images}_installed
> -- 
> 2.28.0
> 

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