[Buildroot] [PATCH 1/3] glibc: ensure BR2_MAKE is also used for subdirs

[Buildroot] [PATCH 1/3] glibc: ensure BR2_MAKE is also used for subdirs

[Peter Korsgaard]

The configure script contains logic to figure out what make program to
invoke for subdirectories (trying gnumake, gmake, make).  Explicitly force
it to use our BR2_MAKE to ensure the right make version is used.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/glibc/glibc.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk
index 708c22f723..c15f32aa3e 100644
--- a/package/glibc/glibc.mk
+++ b/package/glibc/glibc.mk
@@ -34,6 +34,7 @@ GLIBC_DEPENDENCIES = host-gcc-initial linux-headers host-bison host-gawk \
 # glibc requires make >= 4.0 since 2.28 release.
 # https://www.sourceware.org/ml/libc-alpha/2018-08/msg00003.html
 GLIBC_MAKE = $(BR2_MAKE)
+GLIBC_CONV_ENV += ac_cv_prog_MAKE="$(BR2_MAKE)"
 
 GLIBC_SUBDIR = build
 
-- 
2.11.0

[Buildroot] [PATCH 2/3] make: drop gnumake/gmake aliases for host-make

[Peter Korsgaard]

Now that glibc no longer checks for gnumake / gmake, these aliases can be
removed.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/make/make.mk | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/package/make/make.mk b/package/make/make.mk
index 790391c76e..1471576850 100644
--- a/package/make/make.mk
+++ b/package/make/make.mk
@@ -23,15 +23,5 @@ endif
 HOST_MAKE_DEPENDENCIES = host-pkgconf
 HOST_MAKE_CONF_OPTS = --without-guile
 
-# Some packages, like glibc, are looking for gnumake or gmake before
-# make program.
-# Create these symlink to use make binary generated by Buildroot for
-# the host.
-define HOST_MAKE_INSTALL_GNUMAKE
-	ln -fs make $(HOST_DIR)/bin/gnumake
-	ln -fs make $(HOST_DIR)/bin/gmake
-endef
-HOST_MAKE_POST_INSTALL_HOOKS += HOST_MAKE_INSTALL_GNUMAKE
-
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
-- 
2.11.0

[Buildroot] [PATCH 3/3] make: install host-make as host-make

[Peter Korsgaard]

Fixes:
http://autobuild.buildroot.net/results/e29/e293aadc692d2ed337881ef2172ddf66a60bc05c/

And many more.

Install as 'host-make' rather than just 'make', as that otherwise confuses a
number of packages when they invoke recursive / sub-make.  The internal job
control logic of GNU make is version dependant, so mixing versions may lead
to issues like:

make[1]: Entering directory `/home/peko/autobuild/instance-0/output/build/boa-0.94.14rc21'
(cd src && make -w --jobserver-fds=5,6 -j)
make: unrecognized option '--jobserver-fds=5,6'

With this rename, only packages explicitly opting in for our host-make
(using the BR2_MAKE / BR2_MAKE_HOST_DEPENDENCY logic) will use it.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/make/make.mk                    | 7 +++++++
 support/dependencies/check-host-make.mk | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/package/make/make.mk b/package/make/make.mk
index 1471576850..31915d192e 100644
--- a/package/make/make.mk
+++ b/package/make/make.mk
@@ -23,5 +23,12 @@ endif
 HOST_MAKE_DEPENDENCIES = host-pkgconf
 HOST_MAKE_CONF_OPTS = --without-guile
 
+# Rename host-make binary to ensure it isn't accidently used by
+# packages when they invoke recursive / sub-make.
+define HOST_MAKE_RENAME_BINARY
+	mv $(HOST_DIR)/bin/make $(HOST_DIR)/bin/host-make
+endef
+HOST_MAKE_POST_INSTALL_HOOKS += HOST_MAKE_RENAME_BINARY
+
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/support/dependencies/check-host-make.mk b/support/dependencies/check-host-make.mk
index 4235a393fd..66560ee85c 100644
--- a/support/dependencies/check-host-make.mk
+++ b/support/dependencies/check-host-make.mk
@@ -12,8 +12,8 @@ BR2_MAKE ?= $(call suitable-host-package,make,\
 	$(BR2_MAKE_VERSION_MIN) $(MAKE))
 
 ifeq ($(BR2_MAKE),)
-BR2_MAKE = $(HOST_DIR)/bin/make -j$(PARALLEL_JOBS)
-BR2_MAKE1 = $(HOST_DIR)/bin/make -j1
+BR2_MAKE = $(HOST_DIR)/bin/host-make -j$(PARALLEL_JOBS)
+BR2_MAKE1 = $(HOST_DIR)/bin/host-make -j1
 BR2_MAKE_HOST_DEPENDENCY = host-make
 else
 BR2_MAKE = $(MAKE)
-- 
2.11.0

[Buildroot] [PATCH 3/3] make: install host-make as host-make

[yann.morin at orange.com]

Peter, All,

On 2018-11-19 15:02 +0100, Peter Korsgaard spake thusly:
> Fixes:
> http://autobuild.buildroot.net/results/e29/e293aadc692d2ed337881ef2172ddf66a60bc05c/
> 
> And many more.
> 
> Install as 'host-make' rather than just 'make', as that otherwise confuses a
> number of packages when they invoke recursive / sub-make.  The internal job
> control logic of GNU make is version dependant, so mixing versions may lead
> to issues like:
> 
> make[1]: Entering directory `/home/peko/autobuild/instance-0/output/build/boa-0.94.14rc21'
> (cd src && make -w --jobserver-fds=5,6 -j)
> make: unrecognized option '--jobserver-fds=5,6'
> 
> With this rename, only packages explicitly opting in for our host-make
> (using the BR2_MAKE / BR2_MAKE_HOST_DEPENDENCY logic) will use it.
> 
> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
> ---
>  package/make/make.mk                    | 7 +++++++
>  support/dependencies/check-host-make.mk | 4 ++--
>  2 files changed, 9 insertions(+), 2 deletions(-)
> 
> diff --git a/package/make/make.mk b/package/make/make.mk
> index 1471576850..31915d192e 100644
> --- a/package/make/make.mk
> +++ b/package/make/make.mk
> @@ -23,5 +23,12 @@ endif
>  HOST_MAKE_DEPENDENCIES = host-pkgconf
>  HOST_MAKE_CONF_OPTS = --without-guile
>  
> +# Rename host-make binary to ensure it isn't accidently used by
> +# packages when they invoke recursive / sub-make.
> +define HOST_MAKE_RENAME_BINARY
> +	mv $(HOST_DIR)/bin/make $(HOST_DIR)/bin/host-make
> +endef
> +HOST_MAKE_POST_INSTALL_HOOKS += HOST_MAKE_RENAME_BINARY

Why not simply:

    HOST_MAKE_CONF_OPTS += --program-prefix=host-

Regards,
Yann E. MORIN.

PS. Let's see if I can post from this email, now! ;-)

>  $(eval $(autotools-package))
>  $(eval $(host-autotools-package))
> diff --git a/support/dependencies/check-host-make.mk b/support/dependencies/check-host-make.mk
> index 4235a393fd..66560ee85c 100644
> --- a/support/dependencies/check-host-make.mk
> +++ b/support/dependencies/check-host-make.mk
> @@ -12,8 +12,8 @@ BR2_MAKE ?= $(call suitable-host-package,make,\
>  	$(BR2_MAKE_VERSION_MIN) $(MAKE))
>  
>  ifeq ($(BR2_MAKE),)
> -BR2_MAKE = $(HOST_DIR)/bin/make -j$(PARALLEL_JOBS)
> -BR2_MAKE1 = $(HOST_DIR)/bin/make -j1
> +BR2_MAKE = $(HOST_DIR)/bin/host-make -j$(PARALLEL_JOBS)
> +BR2_MAKE1 = $(HOST_DIR)/bin/host-make -j1
>  BR2_MAKE_HOST_DEPENDENCY = host-make
>  else
>  BR2_MAKE = $(MAKE)
> -- 
> 2.11.0
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
                                        ____________
.-----------------.--------------------:       _    :------------------.
|  Yann E. MORIN  | Real-Time Embedded |    __/ )   | /"\ ASCII RIBBON |
| +33 534.541.179 | Software  Designer |  _/ - /'   | \ / CAMPAIGN     |
| +33 638.411.245 '--------------------: (_    `--, |  X  AGAINST      |
|      yann.morin (at) orange.com      |_="    ,--' | / \ HTML MAIL    |
'--------------------------------------:______/_____:------------------'


_________________________________________________________________________________________________________________________

Ce message et ses pieces jointes peuvent contenir des informations confidentielles ou privilegiees et ne doivent donc
pas etre diffuses, exploites ou copies sans autorisation. Si vous avez recu ce message par erreur, veuillez le signaler
a l'expediteur et le detruire ainsi que les pieces jointes. Les messages electroniques etant susceptibles d'alteration,
Orange decline toute responsabilite si ce message a ete altere, deforme ou falsifie. Merci.

This message and its attachments may contain confidential or privileged information that may be protected by law;
they should not be distributed, used or copied without authorisation.
If you have received this email in error, please notify the sender and delete this message and its attachments.
As emails may be altered, Orange is not liable for messages that have been modified, changed or falsified.
Thank you.

[Buildroot] [PATCH 3/3] make: install host-make as host-make

[Peter Korsgaard]

>>>>>   <yann.morin@orange.com> writes:

Hi,

 >> +# Rename host-make binary to ensure it isn't accidently used by
 >> +# packages when they invoke recursive / sub-make.
 >> +define HOST_MAKE_RENAME_BINARY
 >> +	mv $(HOST_DIR)/bin/make $(HOST_DIR)/bin/host-make
 >> +endef
 >> +HOST_MAKE_POST_INSTALL_HOOKS += HOST_MAKE_RENAME_BINARY

 > Why not simply:

 >     HOST_MAKE_CONF_OPTS += --program-prefix=host-

Ehh, because I wasn't aware of it. I'll give it a try - Thanks.

 > Regards,
 > Yann E. MORIN.

 > PS. Let's see if I can post from this email, now! ;-)

It works! ;)

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 1/3] glibc: ensure BR2_MAKE is also used for subdirs

[Baruch Siach]

Hi Peter,

On Mon, Nov 19, 2018 at 03:02:26PM +0100, Peter Korsgaard wrote:
> The configure script contains logic to figure out what make program to
> invoke for subdirectories (trying gnumake, gmake, make).  Explicitly force
> it to use our BR2_MAKE to ensure the right make version is used.
> 
> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
> ---
>  package/glibc/glibc.mk | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk
> index 708c22f723..c15f32aa3e 100644
> --- a/package/glibc/glibc.mk
> +++ b/package/glibc/glibc.mk
> @@ -34,6 +34,7 @@ GLIBC_DEPENDENCIES = host-gcc-initial linux-headers host-bison host-gawk \
>  # glibc requires make >= 4.0 since 2.28 release.
>  # https://www.sourceware.org/ml/libc-alpha/2018-08/msg00003.html
>  GLIBC_MAKE = $(BR2_MAKE)
> +GLIBC_CONV_ENV += ac_cv_prog_MAKE="$(BR2_MAKE)"

GLIBC_CONF_ENV maybe?

baruch

>  GLIBC_SUBDIR = build

-- 
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -

[Buildroot] [PATCH 1/3] glibc: ensure BR2_MAKE is also used for subdirs

[Peter Korsgaard]

>>>>> "Baruch" == Baruch Siach <baruch@tkos.co.il> writes:

 > Hi Peter,
 > On Mon, Nov 19, 2018 at 03:02:26PM +0100, Peter Korsgaard wrote:
 >> The configure script contains logic to figure out what make program to
 >> invoke for subdirectories (trying gnumake, gmake, make).  Explicitly force
 >> it to use our BR2_MAKE to ensure the right make version is used.
 >> 
 >> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
 >> ---
 >> package/glibc/glibc.mk | 1 +
 >> 1 file changed, 1 insertion(+)
 >> 
 >> diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk
 >> index 708c22f723..c15f32aa3e 100644
 >> --- a/package/glibc/glibc.mk
 >> +++ b/package/glibc/glibc.mk
 >> @@ -34,6 +34,7 @@ GLIBC_DEPENDENCIES = host-gcc-initial linux-headers host-bison host-gawk \
 >> # glibc requires make >= 4.0 since 2.28 release.
 >> # https://www.sourceware.org/ml/libc-alpha/2018-08/msg00003.html
 >> GLIBC_MAKE = $(BR2_MAKE)
 >> +GLIBC_CONV_ENV += ac_cv_prog_MAKE="$(BR2_MAKE)"

 > GLIBC_CONF_ENV maybe?

Argh, indeed. Will fix.

-- 
Bye, Peter Korsgaard