All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/2] package/nodejs: clean up DEPENDENCIES
@ 2022-05-12 12:12 Arnout Vandecappelle (Essensium/Mind)
  2022-05-12 12:12 ` [Buildroot] [PATCH 2/2] package/nodejs: use ninja for build Arnout Vandecappelle (Essensium/Mind)
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Arnout Vandecappelle (Essensium/Mind) @ 2022-05-12 12:12 UTC (permalink / raw)
  To: buildroot

One per line, and alphabetical (was already the case for host).

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 package/nodejs/nodejs.mk | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk
index 6dcaf34aa4..909347eb2e 100644
--- a/package/nodejs/nodejs.mk
+++ b/package/nodejs/nodejs.mk
@@ -7,10 +7,21 @@
 NODEJS_VERSION = 16.15.0
 NODEJS_SOURCE = node-v$(NODEJS_VERSION).tar.xz
 NODEJS_SITE = http://nodejs.org/dist/v$(NODEJS_VERSION)
-NODEJS_DEPENDENCIES = host-qemu host-pkgconf host-python3 host-nodejs c-ares \
-	libuv zlib nghttp2 \
+NODEJS_DEPENDENCIES = \
+	c-ares \
+	host-nodejs \
+	host-pkgconf \
+	host-python3 \
+	host-qemu \
+	libuv \
+	nghttp2 \
+	zlib \
 	$(call qstrip,$(BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL_DEPS))
-HOST_NODEJS_DEPENDENCIES = host-icu host-libopenssl host-pkgconf host-python3 \
+HOST_NODEJS_DEPENDENCIES = \
+	host-icu \
+	host-libopenssl \
+	host-pkgconf \
+	host-python3 \
 	host-zlib
 NODEJS_INSTALL_STAGING = YES
 NODEJS_LICENSE = MIT (core code); MIT, Apache and BSD family licenses (Bundled components)
-- 
2.35.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH 2/2] package/nodejs: use ninja for build
  2022-05-12 12:12 [Buildroot] [PATCH 1/2] package/nodejs: clean up DEPENDENCIES Arnout Vandecappelle (Essensium/Mind)
@ 2022-05-12 12:12 ` Arnout Vandecappelle (Essensium/Mind)
  2022-05-12 20:18   ` Yann E. MORIN
  2022-05-12 20:18 ` [Buildroot] [PATCH 1/2] package/nodejs: clean up DEPENDENCIES Yann E. MORIN
  2022-05-28 10:46 ` Peter Korsgaard
  2 siblings, 1 reply; 6+ messages in thread
From: Arnout Vandecappelle (Essensium/Mind) @ 2022-05-12 12:12 UTC (permalink / raw)
  To: buildroot

Not only is ninja much faster, it also avoids the following build
failure:
make[3]: printf: Argument list too long

This failure happens when the output directory is about 6 levels deep.
It's due to the make generator of gyp that uses some crazy shell
processing for splitting up paths on /. The ninja generator does no such
thing.

While we're at it, remove redundant parenthesis in
HOST_NODEJS_CONFIGURE_CMDS.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 package/nodejs/nodejs.mk | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk
index 909347eb2e..70febca74f 100644
--- a/package/nodejs/nodejs.mk
+++ b/package/nodejs/nodejs.mk
@@ -10,6 +10,7 @@ NODEJS_SITE = http://nodejs.org/dist/v$(NODEJS_VERSION)
 NODEJS_DEPENDENCIES = \
 	c-ares \
 	host-nodejs \
+	host-ninja \
 	host-pkgconf \
 	host-python3 \
 	host-qemu \
@@ -20,6 +21,7 @@ NODEJS_DEPENDENCIES = \
 HOST_NODEJS_DEPENDENCIES = \
 	host-icu \
 	host-libopenssl \
+	host-ninja \
 	host-pkgconf \
 	host-python3 \
 	host-zlib
@@ -37,7 +39,8 @@ NODEJS_CONF_OPTS = \
 	--without-dtrace \
 	--without-etw \
 	--cross-compiling \
-	--dest-os=linux
+	--dest-os=linux \
+	--ninja
 
 HOST_NODEJS_MAKE_OPTS = \
 	$(HOST_CONFIGURE_OPTS) \
@@ -82,7 +85,7 @@ NODEJS_CONF_OPTS += --without-npm
 endif
 
 define HOST_NODEJS_CONFIGURE_CMDS
-	(cd $(@D); \
+	cd $(@D); \
 		$(HOST_CONFIGURE_OPTS) \
 		PATH=$(@D)/bin:$(BR_PATH) \
 		PYTHON=$(HOST_DIR)/bin/python3 \
@@ -96,7 +99,7 @@ define HOST_NODEJS_CONFIGURE_CMDS
 		--shared-zlib \
 		--no-cross-compiling \
 		--with-intl=system-icu \
-	)
+		--ninja
 endef
 
 NODEJS_HOST_TOOLS_V8 = \
-- 
2.35.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [Buildroot] [PATCH 1/2] package/nodejs: clean up DEPENDENCIES
  2022-05-12 12:12 [Buildroot] [PATCH 1/2] package/nodejs: clean up DEPENDENCIES Arnout Vandecappelle (Essensium/Mind)
  2022-05-12 12:12 ` [Buildroot] [PATCH 2/2] package/nodejs: use ninja for build Arnout Vandecappelle (Essensium/Mind)
@ 2022-05-12 20:18 ` Yann E. MORIN
  2022-05-12 22:34   ` Arnout Vandecappelle
  2022-05-28 10:46 ` Peter Korsgaard
  2 siblings, 1 reply; 6+ messages in thread
From: Yann E. MORIN @ 2022-05-12 20:18 UTC (permalink / raw)
  To: Arnout Vandecappelle (Essensium/Mind); +Cc: buildroot

Arnout, All,

On 2022-05-12 14:12 +0200, Arnout Vandecappelle (Essensium/Mind) spake thusly:
> One per line, and alphabetical (was already the case for host).
> 
> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
> ---
>  package/nodejs/nodejs.mk | 17 ++++++++++++++---
>  1 file changed, 14 insertions(+), 3 deletions(-)
> 
> diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk
> index 6dcaf34aa4..909347eb2e 100644
> --- a/package/nodejs/nodejs.mk
> +++ b/package/nodejs/nodejs.mk
> @@ -7,10 +7,21 @@
>  NODEJS_VERSION = 16.15.0
>  NODEJS_SOURCE = node-v$(NODEJS_VERSION).tar.xz
>  NODEJS_SITE = http://nodejs.org/dist/v$(NODEJS_VERSION)
> -NODEJS_DEPENDENCIES = host-qemu host-pkgconf host-python3 host-nodejs c-ares \
> -	libuv zlib nghttp2 \
> +NODEJS_DEPENDENCIES = \
> +	c-ares \
> +	host-nodejs \
> +	host-pkgconf \
> +	host-python3 \
> +	host-qemu \

I prefer when all host dependencies go first, then all target
dependencies, so I've also lightly re-oredered.

Applied to master, thanks.

Regards,
Yann E. MORIN.

> +	libuv \
> +	nghttp2 \
> +	zlib \
>  	$(call qstrip,$(BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL_DEPS))
> -HOST_NODEJS_DEPENDENCIES = host-icu host-libopenssl host-pkgconf host-python3 \
> +HOST_NODEJS_DEPENDENCIES = \
> +	host-icu \
> +	host-libopenssl \
> +	host-pkgconf \
> +	host-python3 \
>  	host-zlib
>  NODEJS_INSTALL_STAGING = YES
>  NODEJS_LICENSE = MIT (core code); MIT, Apache and BSD family licenses (Bundled components)
> -- 
> 2.35.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot@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.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [Buildroot] [PATCH 2/2] package/nodejs: use ninja for build
  2022-05-12 12:12 ` [Buildroot] [PATCH 2/2] package/nodejs: use ninja for build Arnout Vandecappelle (Essensium/Mind)
@ 2022-05-12 20:18   ` Yann E. MORIN
  0 siblings, 0 replies; 6+ messages in thread
From: Yann E. MORIN @ 2022-05-12 20:18 UTC (permalink / raw)
  To: Arnout Vandecappelle (Essensium/Mind); +Cc: buildroot

Arnout, All,

On 2022-05-12 14:12 +0200, Arnout Vandecappelle (Essensium/Mind) spake thusly:
> Not only is ninja much faster, it also avoids the following build
> failure:
> make[3]: printf: Argument list too long
> 
> This failure happens when the output directory is about 6 levels deep.
> It's due to the make generator of gyp that uses some crazy shell
> processing for splitting up paths on /. The ninja generator does no such
> thing.
> 
> While we're at it, remove redundant parenthesis in
> HOST_NODEJS_CONFIGURE_CMDS.

Thank you! \o/

> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

Applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
>  package/nodejs/nodejs.mk | 9 ++++++---
>  1 file changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk
> index 909347eb2e..70febca74f 100644
> --- a/package/nodejs/nodejs.mk
> +++ b/package/nodejs/nodejs.mk
> @@ -10,6 +10,7 @@ NODEJS_SITE = http://nodejs.org/dist/v$(NODEJS_VERSION)
>  NODEJS_DEPENDENCIES = \
>  	c-ares \
>  	host-nodejs \
> +	host-ninja \
>  	host-pkgconf \
>  	host-python3 \
>  	host-qemu \
> @@ -20,6 +21,7 @@ NODEJS_DEPENDENCIES = \
>  HOST_NODEJS_DEPENDENCIES = \
>  	host-icu \
>  	host-libopenssl \
> +	host-ninja \
>  	host-pkgconf \
>  	host-python3 \
>  	host-zlib
> @@ -37,7 +39,8 @@ NODEJS_CONF_OPTS = \
>  	--without-dtrace \
>  	--without-etw \
>  	--cross-compiling \
> -	--dest-os=linux
> +	--dest-os=linux \
> +	--ninja
>  
>  HOST_NODEJS_MAKE_OPTS = \
>  	$(HOST_CONFIGURE_OPTS) \
> @@ -82,7 +85,7 @@ NODEJS_CONF_OPTS += --without-npm
>  endif
>  
>  define HOST_NODEJS_CONFIGURE_CMDS
> -	(cd $(@D); \
> +	cd $(@D); \
>  		$(HOST_CONFIGURE_OPTS) \
>  		PATH=$(@D)/bin:$(BR_PATH) \
>  		PYTHON=$(HOST_DIR)/bin/python3 \
> @@ -96,7 +99,7 @@ define HOST_NODEJS_CONFIGURE_CMDS
>  		--shared-zlib \
>  		--no-cross-compiling \
>  		--with-intl=system-icu \
> -	)
> +		--ninja
>  endef
>  
>  NODEJS_HOST_TOOLS_V8 = \
> -- 
> 2.35.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot@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.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [Buildroot] [PATCH 1/2] package/nodejs: clean up DEPENDENCIES
  2022-05-12 20:18 ` [Buildroot] [PATCH 1/2] package/nodejs: clean up DEPENDENCIES Yann E. MORIN
@ 2022-05-12 22:34   ` Arnout Vandecappelle
  0 siblings, 0 replies; 6+ messages in thread
From: Arnout Vandecappelle @ 2022-05-12 22:34 UTC (permalink / raw)
  To: Yann E. MORIN; +Cc: buildroot



On 12/05/2022 22:18, Yann E. MORIN wrote:
> Arnout, All,
> 
> On 2022-05-12 14:12 +0200, Arnout Vandecappelle (Essensium/Mind) spake thusly:
>> One per line, and alphabetical (was already the case for host).
>>
>> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
>> ---
>>   package/nodejs/nodejs.mk | 17 ++++++++++++++---
>>   1 file changed, 14 insertions(+), 3 deletions(-)
>>
>> diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk
>> index 6dcaf34aa4..909347eb2e 100644
>> --- a/package/nodejs/nodejs.mk
>> +++ b/package/nodejs/nodejs.mk
>> @@ -7,10 +7,21 @@
>>   NODEJS_VERSION = 16.15.0
>>   NODEJS_SOURCE = node-v$(NODEJS_VERSION).tar.xz
>>   NODEJS_SITE = http://nodejs.org/dist/v$(NODEJS_VERSION)
>> -NODEJS_DEPENDENCIES = host-qemu host-pkgconf host-python3 host-nodejs c-ares \
>> -	libuv zlib nghttp2 \
>> +NODEJS_DEPENDENCIES = \
>> +	c-ares \
>> +	host-nodejs \
>> +	host-pkgconf \
>> +	host-python3 \
>> +	host-qemu \
> 
> I prefer when all host dependencies go first, then all target
> dependencies, so I've also lightly re-oredered.

  I actually prefer that as well. So good call!

  Regards,
  Arnout

> 
> Applied to master, thanks.
> 
> Regards,
> Yann E. MORIN.
> 
>> +	libuv \
>> +	nghttp2 \
>> +	zlib \
>>   	$(call qstrip,$(BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL_DEPS))
>> -HOST_NODEJS_DEPENDENCIES = host-icu host-libopenssl host-pkgconf host-python3 \
>> +HOST_NODEJS_DEPENDENCIES = \
>> +	host-icu \
>> +	host-libopenssl \
>> +	host-pkgconf \
>> +	host-python3 \
>>   	host-zlib
>>   NODEJS_INSTALL_STAGING = YES
>>   NODEJS_LICENSE = MIT (core code); MIT, Apache and BSD family licenses (Bundled components)
>> -- 
>> 2.35.1
>>
>> _______________________________________________
>> buildroot mailing list
>> buildroot@buildroot.org
>> https://lists.buildroot.org/mailman/listinfo/buildroot
> 
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [Buildroot] [PATCH 1/2] package/nodejs: clean up DEPENDENCIES
  2022-05-12 12:12 [Buildroot] [PATCH 1/2] package/nodejs: clean up DEPENDENCIES Arnout Vandecappelle (Essensium/Mind)
  2022-05-12 12:12 ` [Buildroot] [PATCH 2/2] package/nodejs: use ninja for build Arnout Vandecappelle (Essensium/Mind)
  2022-05-12 20:18 ` [Buildroot] [PATCH 1/2] package/nodejs: clean up DEPENDENCIES Yann E. MORIN
@ 2022-05-28 10:46 ` Peter Korsgaard
  2 siblings, 0 replies; 6+ messages in thread
From: Peter Korsgaard @ 2022-05-28 10:46 UTC (permalink / raw)
  To: Arnout Vandecappelle (Essensium/Mind); +Cc: buildroot

>>>>> "Arnout" == Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> writes:

 > One per line, and alphabetical (was already the case for host).
 > Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

Committed to 2022.02.x, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2022-05-28 10:46 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-12 12:12 [Buildroot] [PATCH 1/2] package/nodejs: clean up DEPENDENCIES Arnout Vandecappelle (Essensium/Mind)
2022-05-12 12:12 ` [Buildroot] [PATCH 2/2] package/nodejs: use ninja for build Arnout Vandecappelle (Essensium/Mind)
2022-05-12 20:18   ` Yann E. MORIN
2022-05-12 20:18 ` [Buildroot] [PATCH 1/2] package/nodejs: clean up DEPENDENCIES Yann E. MORIN
2022-05-12 22:34   ` Arnout Vandecappelle
2022-05-28 10:46 ` Peter Korsgaard

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.