commit:     fa5ca61883ac6e2931a1caeab96018ab9a7a4755
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  4 01:41:54 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec  4 01:44:46 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa5ca618

net-libs/nodejs: use eninja for jobserver support

Switch back to using eninja directly, not emake->ninja. Calling ninja
indirectly has a few disadvantages, as we have to both pass -Onone to
bypass Portage's default for output synchronisation, it means we have
to hack around not having options passed down to ninja, and it breaks
jobserver support (because ninja won't act as a client if -jN is passed).

We started using emake in 9825cd3d791456cd0265d0c82611c4ceffd4ff22 to avoid
ninja-utils (not clear to me why) but since 
305e66472660ee50117267b499f23d3883340deb
we already use ninja-utils again, so the indirection gains us nothing.

With this, nodejs + the steve jobserver doesn't bomb my machine with
jobs anymore.

Closes: https://bugs.gentoo.org/966651
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/nodejs/nodejs-20.18.2.ebuild  | 3 +--
 net-libs/nodejs/nodejs-20.19.2.ebuild  | 3 +--
 net-libs/nodejs/nodejs-20.19.5.ebuild  | 3 +--
 net-libs/nodejs/nodejs-22.13.1.ebuild  | 3 +--
 net-libs/nodejs/nodejs-22.16.0.ebuild  | 3 +--
 net-libs/nodejs/nodejs-22.19.0.ebuild  | 3 +--
 net-libs/nodejs/nodejs-22.20.0.ebuild  | 3 +--
 net-libs/nodejs/nodejs-22.21.1.ebuild  | 3 +--
 net-libs/nodejs/nodejs-24.1.0.ebuild   | 3 +--
 net-libs/nodejs/nodejs-24.11.1.ebuild  | 3 +--
 net-libs/nodejs/nodejs-24.2.0.ebuild   | 3 +--
 net-libs/nodejs/nodejs-24.7.0.ebuild   | 3 +--
 net-libs/nodejs/nodejs-24.9.0.ebuild   | 3 +--
 net-libs/nodejs/nodejs-99999999.ebuild | 3 +--
 14 files changed, 14 insertions(+), 28 deletions(-)

diff --git a/net-libs/nodejs/nodejs-20.18.2.ebuild 
b/net-libs/nodejs/nodejs-20.18.2.ebuild
index 5d1123df47ec..4d21e2fd5850 100644
--- a/net-libs/nodejs/nodejs-20.18.2.ebuild
+++ b/net-libs/nodejs/nodejs-20.18.2.ebuild
@@ -169,8 +169,7 @@ src_configure() {
 }
 
 src_compile() {
-       export NINJA_ARGS=" $(get_NINJAOPTS) "
-       emake -Onone
+       eninja -C out/Release
 }
 
 src_install() {

diff --git a/net-libs/nodejs/nodejs-20.19.2.ebuild 
b/net-libs/nodejs/nodejs-20.19.2.ebuild
index acb569c1b230..b9ec203a7fdc 100644
--- a/net-libs/nodejs/nodejs-20.19.2.ebuild
+++ b/net-libs/nodejs/nodejs-20.19.2.ebuild
@@ -169,8 +169,7 @@ src_configure() {
 }
 
 src_compile() {
-       export NINJA_ARGS=" $(get_NINJAOPTS) "
-       emake -Onone
+       eninja -C out/Release
 }
 
 src_install() {

diff --git a/net-libs/nodejs/nodejs-20.19.5.ebuild 
b/net-libs/nodejs/nodejs-20.19.5.ebuild
index e967d593ad8f..0d597c084899 100644
--- a/net-libs/nodejs/nodejs-20.19.5.ebuild
+++ b/net-libs/nodejs/nodejs-20.19.5.ebuild
@@ -169,8 +169,7 @@ src_configure() {
 }
 
 src_compile() {
-       export NINJA_ARGS=" $(get_NINJAOPTS) "
-       emake -Onone
+       eninja -C out/Release
 }
 
 src_install() {

diff --git a/net-libs/nodejs/nodejs-22.13.1.ebuild 
b/net-libs/nodejs/nodejs-22.13.1.ebuild
index 00d972e0a2cb..bedbd219bb04 100644
--- a/net-libs/nodejs/nodejs-22.13.1.ebuild
+++ b/net-libs/nodejs/nodejs-22.13.1.ebuild
@@ -188,8 +188,7 @@ src_configure() {
 }
 
 src_compile() {
-       export NINJA_ARGS=" $(get_NINJAOPTS)"
-       emake -Onone
+       eninja -C out/Release
 }
 
 src_install() {

diff --git a/net-libs/nodejs/nodejs-22.16.0.ebuild 
b/net-libs/nodejs/nodejs-22.16.0.ebuild
index ae37d9d00c4d..d5b2e6b0f979 100644
--- a/net-libs/nodejs/nodejs-22.16.0.ebuild
+++ b/net-libs/nodejs/nodejs-22.16.0.ebuild
@@ -188,8 +188,7 @@ src_configure() {
 }
 
 src_compile() {
-       export NINJA_ARGS=" $(get_NINJAOPTS)"
-       emake -Onone
+       eninja -C out/Release
 }
 
 src_install() {

diff --git a/net-libs/nodejs/nodejs-22.19.0.ebuild 
b/net-libs/nodejs/nodejs-22.19.0.ebuild
index ae37d9d00c4d..d5b2e6b0f979 100644
--- a/net-libs/nodejs/nodejs-22.19.0.ebuild
+++ b/net-libs/nodejs/nodejs-22.19.0.ebuild
@@ -188,8 +188,7 @@ src_configure() {
 }
 
 src_compile() {
-       export NINJA_ARGS=" $(get_NINJAOPTS)"
-       emake -Onone
+       eninja -C out/Release
 }
 
 src_install() {

diff --git a/net-libs/nodejs/nodejs-22.20.0.ebuild 
b/net-libs/nodejs/nodejs-22.20.0.ebuild
index ae37d9d00c4d..d5b2e6b0f979 100644
--- a/net-libs/nodejs/nodejs-22.20.0.ebuild
+++ b/net-libs/nodejs/nodejs-22.20.0.ebuild
@@ -188,8 +188,7 @@ src_configure() {
 }
 
 src_compile() {
-       export NINJA_ARGS=" $(get_NINJAOPTS)"
-       emake -Onone
+       eninja -C out/Release
 }
 
 src_install() {

diff --git a/net-libs/nodejs/nodejs-22.21.1.ebuild 
b/net-libs/nodejs/nodejs-22.21.1.ebuild
index 23556fb3ffd5..6153f44bfa7c 100644
--- a/net-libs/nodejs/nodejs-22.21.1.ebuild
+++ b/net-libs/nodejs/nodejs-22.21.1.ebuild
@@ -189,8 +189,7 @@ src_configure() {
 }
 
 src_compile() {
-       export NINJA_ARGS=" $(get_NINJAOPTS)"
-       emake -Onone
+       eninja -C out/Release
 }
 
 src_install() {

diff --git a/net-libs/nodejs/nodejs-24.1.0.ebuild 
b/net-libs/nodejs/nodejs-24.1.0.ebuild
index 671a0a821390..0814231cfbed 100644
--- a/net-libs/nodejs/nodejs-24.1.0.ebuild
+++ b/net-libs/nodejs/nodejs-24.1.0.ebuild
@@ -185,8 +185,7 @@ src_configure() {
 }
 
 src_compile() {
-       export NINJA_ARGS=" $(get_NINJAOPTS)"
-       emake -Onone
+       eninja -C out/Release
 }
 
 src_install() {

diff --git a/net-libs/nodejs/nodejs-24.11.1.ebuild 
b/net-libs/nodejs/nodejs-24.11.1.ebuild
index bdfd8e8d9b14..03d45119624e 100644
--- a/net-libs/nodejs/nodejs-24.11.1.ebuild
+++ b/net-libs/nodejs/nodejs-24.11.1.ebuild
@@ -187,8 +187,7 @@ src_configure() {
 }
 
 src_compile() {
-       export NINJA_ARGS=" $(get_NINJAOPTS)"
-       emake -Onone
+       eninja -C out/Release
 }
 
 src_install() {

diff --git a/net-libs/nodejs/nodejs-24.2.0.ebuild 
b/net-libs/nodejs/nodejs-24.2.0.ebuild
index 25d2eaa39595..3a370cd5eaec 100644
--- a/net-libs/nodejs/nodejs-24.2.0.ebuild
+++ b/net-libs/nodejs/nodejs-24.2.0.ebuild
@@ -185,8 +185,7 @@ src_configure() {
 }
 
 src_compile() {
-       export NINJA_ARGS=" $(get_NINJAOPTS)"
-       emake -Onone
+       eninja -C out/Release
 }
 
 src_install() {

diff --git a/net-libs/nodejs/nodejs-24.7.0.ebuild 
b/net-libs/nodejs/nodejs-24.7.0.ebuild
index 25d2eaa39595..3a370cd5eaec 100644
--- a/net-libs/nodejs/nodejs-24.7.0.ebuild
+++ b/net-libs/nodejs/nodejs-24.7.0.ebuild
@@ -185,8 +185,7 @@ src_configure() {
 }
 
 src_compile() {
-       export NINJA_ARGS=" $(get_NINJAOPTS)"
-       emake -Onone
+       eninja -C out/Release
 }
 
 src_install() {

diff --git a/net-libs/nodejs/nodejs-24.9.0.ebuild 
b/net-libs/nodejs/nodejs-24.9.0.ebuild
index abc2f72899cb..5e56aedb414a 100644
--- a/net-libs/nodejs/nodejs-24.9.0.ebuild
+++ b/net-libs/nodejs/nodejs-24.9.0.ebuild
@@ -186,8 +186,7 @@ src_configure() {
 }
 
 src_compile() {
-       export NINJA_ARGS=" $(get_NINJAOPTS)"
-       emake -Onone
+       eninja -C out/Release
 }
 
 src_install() {

diff --git a/net-libs/nodejs/nodejs-99999999.ebuild 
b/net-libs/nodejs/nodejs-99999999.ebuild
index 1fc1bb824630..358e2e2fd94b 100644
--- a/net-libs/nodejs/nodejs-99999999.ebuild
+++ b/net-libs/nodejs/nodejs-99999999.ebuild
@@ -185,8 +185,7 @@ src_configure() {
 }
 
 src_compile() {
-       export NINJA_ARGS=" $(get_NINJAOPTS)"
-       emake -Onone
+       eninja -C out/Release
 }
 
 src_install() {

Reply via email to