diff mbox series

[13/13] package/nodejs: build host-nodejs only if we're installing modules with NPM

Message ID 20220809075704.86472-14-ardeleanalex@gmail.com
State Accepted
Headers show
Series package/nodejs: rework cross-building | expand

Commit Message

Alexandru Ardelean Aug. 9, 2022, 7:57 a.m. UTC 
At this point in time, we only need the host-nodejs build if we want to npm
tool to install node_modules on the target.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
---
 package/nodejs/Config.in | 2 +-
 package/nodejs/nodejs.mk | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/package/nodejs/Config.in b/package/nodejs/Config.in
index 0b6ded6562..551cecc0b8 100644
--- a/package/nodejs/Config.in
+++ b/package/nodejs/Config.in
@@ -29,7 +29,7 @@  config BR2_PACKAGE_NODEJS
 	depends on !BR2_STATIC_LIBS
 	select BR2_HOSTARCH_NEEDS_IA32_COMPILER if !BR2_ARCH_IS_64
 	select BR2_HOSTARCH_NEEDS_IA32_LIBS if !BR2_ARCH_IS_64
-	select BR2_PACKAGE_HOST_NODEJS
+	select BR2_PACKAGE_HOST_NODEJS if BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL != ""
 	select BR2_PACKAGE_HOST_C_ARES
 	select BR2_PACKAGE_HOST_LIBUV
 	select BR2_PACKAGE_HOST_NGHTTP2
diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk
index 6988df3d84..43ca636312 100644
--- a/package/nodejs/nodejs.mk
+++ b/package/nodejs/nodejs.mk
@@ -8,7 +8,6 @@  NODEJS_VERSION = 16.16.0
 NODEJS_SOURCE = node-v$(NODEJS_VERSION).tar.xz
 NODEJS_SITE = http://nodejs.org/dist/v$(NODEJS_VERSION)
 NODEJS_DEPENDENCIES = \
-	host-nodejs \
 	host-c-ares \
 	host-libuv \
 	host-nghttp2 \
@@ -224,6 +223,7 @@  NPM = $(TARGET_CONFIGURE_OPTS) \
 # We can only call NPM if there's something to install.
 #
 ifneq ($(NODEJS_MODULES_LIST),)
+NODEJS_DEPENDENCIES += host-nodejs
 define NODEJS_INSTALL_MODULES
 	# If you're having trouble with module installation, adding -d to the
 	# npm install call below and setting npm_config_rollback=false can both