diff options
| author | Hirokazu MORIKAWA <morikw2@gmail.com> | 2022-04-06 10:12:57 +0900 |
|---|---|---|
| committer | Rosen Penev <rosenp@gmail.com> | 2022-04-16 11:00:54 -0700 |
| commit | ef87dfec7221d4f2ca3b374be52e3b4cd271a835 (patch) | |
| tree | a22914be0699c98f1b4e3ea48c96ed492abdc695 | |
| parent | 5beac5427709e562fd39f0f198cd4dfb7eaa286a (diff) | |
node-homebridge: Support for npm@8
With the upgrade of node.js to version 16, the npm version will also change to version 8.
This fix is to support npm@8. npm@6 can also build without problems.
Signed-off-by: Hirokazu MORIKAWA <morikw2@gmail.com>
| -rw-r--r-- | lang/node-homebridge/Makefile | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/lang/node-homebridge/Makefile b/lang/node-homebridge/Makefile index 209e1a0bf..0b71fafb8 100644 --- a/lang/node-homebridge/Makefile +++ b/lang/node-homebridge/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NPM_NAME:=homebridge PKG_NAME:=node-$(PKG_NPM_NAME) PKG_VERSION:=1.2.4 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NPM_NAME)-$(PKG_VERSION).tgz PKG_SOURCE_URL:=https://registry.npmjs.org/$(PKG_NPM_NAME)/-/ @@ -46,8 +46,7 @@ TMPNPM:=$(shell mktemp -u XXXXXXXXXX) TARGET_CFLAGS+=$(FPIC) TARGET_CPPFLAGS+=$(FPIC) -define Build/Compile - $(MAKE_VARS) \ +NPM_FLAGS=$(MAKE_VARS) \ $(MAKE_FLAGS) \ npm_config_arch=$(NODEJS_CPU) \ npm_config_target_arch=$(NODEJS_CPU) \ @@ -55,7 +54,11 @@ define Build/Compile npm_config_nodedir=$(STAGING_DIR)/usr/ \ npm_config_prefix=$(PKG_INSTALL_DIR)/usr/ \ npm_config_cache=$(TMP_DIR)/npm-cache-$(TMPNPM) \ - npm_config_tmp=$(TMP_DIR)/npm-tmp-$(TMPNPM) \ + npm_config_tmp=$(TMP_DIR)/npm-tmp-$(TMPNPM) + +define Build/Compile + $(NPM_FLAGS) npm i -g --production $(PKG_BUILD_DIR) + $(NPM_FLAGS) npm i --production --prefix=$(PKG_BUILD_DIR) --target_arch=$(NODEJS_CPU) --prefer-dedupe npm install -g $(PKG_BUILD_DIR) rm -rf $(TMP_DIR)/npm-tmp-$(TMPNPM) rm -rf $(TMP_DIR)/npm-cache-$(TMPNPM) |