Merge pull request #3293 from NeoRaider/node

node: use default host install prefix
This commit is contained in:
John Crispin 2016-10-04 09:12:03 +02:00 committed by GitHub
commit 301aa32de1
5 changed files with 5 additions and 5 deletions

View file

@ -54,7 +54,7 @@ define Build/Compile
npm_config_nodedir=$(BUILD_DIR)/node-v$(PKG_NODE_VERSION)/ \ npm_config_nodedir=$(BUILD_DIR)/node-v$(PKG_NODE_VERSION)/ \
npm_config_cache=$(BUILD_DIR)/node-v$(PKG_NODE_VERSION)/npm-cache \ npm_config_cache=$(BUILD_DIR)/node-v$(PKG_NODE_VERSION)/npm-cache \
PREFIX="$(PKG_INSTALL_DIR)/usr/" \ PREFIX="$(PKG_INSTALL_DIR)/usr/" \
$(STAGING_DIR)/host/bin/npm install -g $(PKG_BUILD_DIR) npm install -g $(PKG_BUILD_DIR)
endef endef
define Package/node-arduino-firmata/install define Package/node-arduino-firmata/install

View file

@ -69,7 +69,7 @@ define Build/Compile
npm_config_nodedir=$(BUILD_DIR)/node-v$(PKG_NODE_VERSION)/ \ npm_config_nodedir=$(BUILD_DIR)/node-v$(PKG_NODE_VERSION)/ \
npm_config_cache=$(BUILD_DIR)/node-v$(PKG_NODE_VERSION)/npm-cache \ npm_config_cache=$(BUILD_DIR)/node-v$(PKG_NODE_VERSION)/npm-cache \
PREFIX="$(PKG_INSTALL_DIR)/usr/" \ PREFIX="$(PKG_INSTALL_DIR)/usr/" \
$(STAGING_DIR)/host/bin/npm install -g $(PKG_BUILD_DIR) npm install -g $(PKG_BUILD_DIR)
endef endef
define Package/node-cylon/install define Package/node-cylon/install

View file

@ -53,7 +53,7 @@ define Build/Compile
npm_config_nodedir=$(BUILD_DIR)/node-v$(PKG_NODE_VERSION)/ \ npm_config_nodedir=$(BUILD_DIR)/node-v$(PKG_NODE_VERSION)/ \
npm_config_cache=$(BUILD_DIR)/node-v$(PKG_NODE_VERSION)/npm-cache \ npm_config_cache=$(BUILD_DIR)/node-v$(PKG_NODE_VERSION)/npm-cache \
PREFIX="$(PKG_INSTALL_DIR)/usr/" \ PREFIX="$(PKG_INSTALL_DIR)/usr/" \
$(STAGING_DIR)/host/bin/npm install --build-from-source --target_arch=$(CPU) -g $(PKG_BUILD_DIR) npm install --build-from-source --target_arch=$(CPU) -g $(PKG_BUILD_DIR)
endef endef
define Package/node-hid/install define Package/node-hid/install

View file

@ -53,7 +53,7 @@ define Build/Compile
npm_config_nodedir=$(BUILD_DIR)/node-v$(PKG_NODE_VERSION)/ \ npm_config_nodedir=$(BUILD_DIR)/node-v$(PKG_NODE_VERSION)/ \
npm_config_cache=$(BUILD_DIR)/node-v$(PKG_NODE_VERSION)/npm-cache \ npm_config_cache=$(BUILD_DIR)/node-v$(PKG_NODE_VERSION)/npm-cache \
PREFIX="$(PKG_INSTALL_DIR)/usr/" \ PREFIX="$(PKG_INSTALL_DIR)/usr/" \
$(STAGING_DIR)/host/bin/npm install --build-from-source --target_arch=$(CPU) -g $(PKG_BUILD_DIR) npm install --build-from-source --target_arch=$(CPU) -g $(PKG_BUILD_DIR)
endef endef
define Package/node-serialport/install define Package/node-serialport/install

View file

@ -61,7 +61,7 @@ HOST_CONFIGURE_VARS:=
HOST_CONFIGURE_ARGS:= \ HOST_CONFIGURE_ARGS:= \
--dest-os=linux \ --dest-os=linux \
--without-snapshot \ --without-snapshot \
--prefix=$(STAGING_DIR)/host/ --prefix=$(HOST_BUILD_PREFIX)
HOST_CONFIGURE_CMD:=python ./configure HOST_CONFIGURE_CMD:=python ./configure