From d905324e49ce17924f3d20e4d764168b043295a4 Mon Sep 17 00:00:00 2001 From: Hirokazu MORIKAWA Date: Wed, 17 Apr 2019 14:55:05 +0900 Subject: [PATCH] node-hid: fix i386 build fail more stability for parallel build Signed-off-by: Hirokazu MORIKAWA (cherry-picked from 1aa55f86b56766074677bcda23f19cd7e5b5601f) --- lang/node-hid/Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lang/node-hid/Makefile b/lang/node-hid/Makefile index a22fbe12d2..390b3d2923 100644 --- a/lang/node-hid/Makefile +++ b/lang/node-hid/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NPM_NAME:=hid PKG_NAME:=node-$(PKG_NPM_NAME) PKG_VERSION:=0.7.2 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/node-hid/node-hid.git @@ -43,7 +43,9 @@ endef CPU:=$(subst x86_64,x64,$(subst i386,ia32,$(ARCH))) -EXTRA_CFLAGS+=$(FPIC) -I$(STAGING_DIR)/usr/include/libusb-1.0 +TMPNPM:=$(shell mktemp -u XXXXXXXXXX) + +TARGET_CFLAGS+=$(FPIC) -I$(STAGING_DIR)/usr/include/libusb-1.0 define Build/Compile git init $(PKG_BUILD_DIR) @@ -51,7 +53,7 @@ define Build/Compile $(MAKE_FLAGS) \ npm_config_arch=$(CONFIG_ARCH) \ 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-$(TMPNPM) \ PREFIX="$(PKG_INSTALL_DIR)/usr/" \ npm install --build-from-source --target_arch=$(CPU) -g $(PKG_BUILD_DIR) endef