From c50256b6d2c4357cfea39350fa6f5496995e200d Mon Sep 17 00:00:00 2001 From: Martin Bark Date: Thu, 2 Jul 2015 10:43:27 +0100 Subject: [PATCH] package/nodejs: Define NPM command for other packages to use Other nodejs-related packages will need to call npm with the same set of arguments as is currently used by the nodejs package itself. To avoid duplicating this code, set the NPM variable so those packages can re-use it. Signed-off-by: Martin Bark Acked-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/nodejs/nodejs.mk | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk index 156b151bee..414f3f3d49 100644 --- a/package/nodejs/nodejs.mk +++ b/package/nodejs/nodejs.mk @@ -95,6 +95,15 @@ NODEJS_MODULES_LIST= $(call qstrip,\ $(if $(BR2_PACKAGE_NODEJS_MODULES_COFFEESCRIPT),coffee-script) \ $(BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL)) +# Define NPM for other packages to use +NPM = $(TARGET_CONFIGURE_OPTS) \ + LD="$(TARGET_CXX)" \ + npm_config_arch=$(NODEJS_CPU) \ + npm_config_target_arch=$(NODEJS_CPU) \ + npm_config_build_from_source=true \ + npm_config_nodedir=$(BUILD_DIR)/nodejs-$(NODEJS_VERSION) \ + $(HOST_DIR)/usr/bin/npm + # # We can only call NPM if there's something to install. # @@ -104,14 +113,7 @@ define NODEJS_INSTALL_MODULES # npm install call below and setting npm_config_rollback=false can both # help in diagnosing the problem. (cd $(TARGET_DIR)/usr/lib && mkdir -p node_modules && \ - $(TARGET_CONFIGURE_OPTS) \ - LD="$(TARGET_CXX)" \ - npm_config_arch=$(NODEJS_CPU) \ - npm_config_target_arch=$(NODEJS_CPU) \ - npm_config_build_from_source=true \ - npm_config_nodedir=$(BUILD_DIR)/nodejs-$(NODEJS_VERSION) \ - $(HOST_DIR)/usr/bin/npm install \ - $(NODEJS_MODULES_LIST) \ + $(NPM) install $(NODEJS_MODULES_LIST) \ ) # Symlink all executables in $(TARGET_DIR)/usr/lib/node_modules/.bin to