From fa5ca61883ac6e2931a1caeab96018ab9a7a4755 Mon Sep 17 00:00:00 2001 From: Sam James Date: Thu, 4 Dec 2025 01:41:54 +0000 Subject: [PATCH] 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 --- 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 5d1123df47ecf..4d21e2fd5850e 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 acb569c1b2306..b9ec203a7fdc5 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 e967d593ad8f8..0d597c0848992 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 00d972e0a2cbb..bedbd219bb044 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 ae37d9d00c4dd..d5b2e6b0f9793 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 ae37d9d00c4dd..d5b2e6b0f9793 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 ae37d9d00c4dd..d5b2e6b0f9793 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 23556fb3ffd56..6153f44bfa7c9 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 671a0a8213908..0814231cfbed2 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 bdfd8e8d9b149..03d45119624eb 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 25d2eaa39595a..3a370cd5eaece 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 25d2eaa39595a..3a370cd5eaece 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 abc2f72899cb9..5e56aedb414ae 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 1fc1bb824630a..358e2e2fd94b1 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() {