Message ID | db7a911e37b838e8b96707502259828e011cbb36.1580761209.git.yann.morin.1998@free.fr |
---|---|
State | Accepted |
Headers | show |
Series | [1/2] package/uboot-tools: needs make >= 4.0 | expand |
>>>>> "Yann" == Yann E MORIN <yann.morin.1998@free.fr> writes: > Starting with 2020.01, uboot started using the 'undefine' make > directive, which was only introduced with make 4.0. > So, use the existing $(BR2_MAKE_HOST_DEPENDENCY) and $(BR2_MAKE), > both of each will ensure that we do use a make that is at least 4.0. > Fixes: > http://autobuild.buildroot.org/results/c97/c976ed5eb7760cba192d22b3f1e7460596fd82dd/ > Reported-by: Peter Korsgaard <peter@korsgaard.com> > Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr> > --- > package/uboot-tools/uboot-tools.mk | 9 ++++++--- > 1 file changed, 6 insertions(+), 3 deletions(-) > diff --git a/package/uboot-tools/uboot-tools.mk b/package/uboot-tools/uboot-tools.mk > index 1f0bac5bf7..98ac71911b 100644 > --- a/package/uboot-tools/uboot-tools.mk > +++ b/package/uboot-tools/uboot-tools.mk > @@ -11,6 +11,9 @@ UBOOT_TOOLS_LICENSE = GPL-2.0+ > UBOOT_TOOLS_LICENSE_FILES = Licenses/gpl-2.0.txt > UBOOT_TOOLS_INSTALL_STAGING = YES > +UBOOT_TOOLS_DEPENDENCIES = $(BR2_MAKE_HOST_DEPENDENCY) > +HOST_UBOOT_TOOLS_DEPENDENCIES = $(BR2_MAKE_HOST_DEPENDENCY) I added a comment explaining why we are doing this and committed, thanks.
diff --git a/package/uboot-tools/uboot-tools.mk b/package/uboot-tools/uboot-tools.mk index 1f0bac5bf7..98ac71911b 100644 --- a/package/uboot-tools/uboot-tools.mk +++ b/package/uboot-tools/uboot-tools.mk @@ -11,6 +11,9 @@ UBOOT_TOOLS_LICENSE = GPL-2.0+ UBOOT_TOOLS_LICENSE_FILES = Licenses/gpl-2.0.txt UBOOT_TOOLS_INSTALL_STAGING = YES +UBOOT_TOOLS_DEPENDENCIES = $(BR2_MAKE_HOST_DEPENDENCY) +HOST_UBOOT_TOOLS_DEPENDENCIES = $(BR2_MAKE_HOST_DEPENDENCY) + define UBOOT_TOOLS_CONFIGURE_CMDS mkdir -p $(@D)/include/config touch $(@D)/include/config/auto.conf @@ -39,9 +42,9 @@ endef endif define UBOOT_TOOLS_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(UBOOT_TOOLS_MAKE_OPTS) \ + $(TARGET_MAKE_ENV) $(BR2_MAKE) -C $(@D) $(UBOOT_TOOLS_MAKE_OPTS) \ CROSS_BUILD_TOOLS=y tools-only - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(UBOOT_TOOLS_MAKE_OPTS) \ + $(TARGET_MAKE_ENV) $(BR2_MAKE) -C $(@D) $(UBOOT_TOOLS_MAKE_OPTS) \ envtools no-dot-config-targets=envtools endef @@ -103,7 +106,7 @@ HOST_UBOOT_TOOLS_DEPENDENCIES += host-openssl endif define HOST_UBOOT_TOOLS_BUILD_CMDS - $(MAKE1) -C $(@D) $(HOST_UBOOT_TOOLS_MAKE_OPTS) tools-only + $(BR2_MAKE1) -C $(@D) $(HOST_UBOOT_TOOLS_MAKE_OPTS) tools-only endef define HOST_UBOOT_TOOLS_INSTALL_CMDS
Starting with 2020.01, uboot started using the 'undefine' make directive, which was only introduced with make 4.0. So, use the existing $(BR2_MAKE_HOST_DEPENDENCY) and $(BR2_MAKE), both of each will ensure that we do use a make that is at least 4.0. Fixes: http://autobuild.buildroot.org/results/c97/c976ed5eb7760cba192d22b3f1e7460596fd82dd/ Reported-by: Peter Korsgaard <peter@korsgaard.com> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr> --- package/uboot-tools/uboot-tools.mk | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)