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> (cherry picked from commit 3138eacbe3d92a05e8c3f45879981e302362ecb4)
This commit is contained in:
parent
97d325e6d4
commit
9934d28513
1 changed files with 7 additions and 4 deletions
|
@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
|
||||||
PKG_NPM_NAME:=homebridge
|
PKG_NPM_NAME:=homebridge
|
||||||
PKG_NAME:=node-$(PKG_NPM_NAME)
|
PKG_NAME:=node-$(PKG_NPM_NAME)
|
||||||
PKG_VERSION:=1.2.4
|
PKG_VERSION:=1.2.4
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=2
|
||||||
|
|
||||||
PKG_SOURCE:=$(PKG_NPM_NAME)-$(PKG_VERSION).tgz
|
PKG_SOURCE:=$(PKG_NPM_NAME)-$(PKG_VERSION).tgz
|
||||||
PKG_SOURCE_URL:=https://registry.npmjs.org/$(PKG_NPM_NAME)/-/
|
PKG_SOURCE_URL:=https://registry.npmjs.org/$(PKG_NPM_NAME)/-/
|
||||||
|
@ -46,8 +46,7 @@ TMPNPM:=$(shell mktemp -u XXXXXXXXXX)
|
||||||
TARGET_CFLAGS+=$(FPIC)
|
TARGET_CFLAGS+=$(FPIC)
|
||||||
TARGET_CPPFLAGS+=$(FPIC)
|
TARGET_CPPFLAGS+=$(FPIC)
|
||||||
|
|
||||||
define Build/Compile
|
NPM_FLAGS=$(MAKE_VARS) \
|
||||||
$(MAKE_VARS) \
|
|
||||||
$(MAKE_FLAGS) \
|
$(MAKE_FLAGS) \
|
||||||
npm_config_arch=$(NODEJS_CPU) \
|
npm_config_arch=$(NODEJS_CPU) \
|
||||||
npm_config_target_arch=$(NODEJS_CPU) \
|
npm_config_target_arch=$(NODEJS_CPU) \
|
||||||
|
@ -55,7 +54,11 @@ define Build/Compile
|
||||||
npm_config_nodedir=$(STAGING_DIR)/usr/ \
|
npm_config_nodedir=$(STAGING_DIR)/usr/ \
|
||||||
npm_config_prefix=$(PKG_INSTALL_DIR)/usr/ \
|
npm_config_prefix=$(PKG_INSTALL_DIR)/usr/ \
|
||||||
npm_config_cache=$(TMP_DIR)/npm-cache-$(TMPNPM) \
|
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)
|
npm install -g $(PKG_BUILD_DIR)
|
||||||
rm -rf $(TMP_DIR)/npm-tmp-$(TMPNPM)
|
rm -rf $(TMP_DIR)/npm-tmp-$(TMPNPM)
|
||||||
rm -rf $(TMP_DIR)/npm-cache-$(TMPNPM)
|
rm -rf $(TMP_DIR)/npm-cache-$(TMPNPM)
|
||||||
|
|
Loading…
Reference in a new issue