From: Hirokazu MORIKAWA Date: Fri, 19 Apr 2019 00:22:23 +0000 (+0900) Subject: node-serialport: fix i386 build fail X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=4ac86244ab01b4f545ca14d460711f3003f14ef6;p=feed%2Fpackages.git node-serialport: fix i386 build fail more stability for parallel build Signed-off-by: Hirokazu MORIKAWA (cherry-picked from 1ce1ca6e0622c6ad7fb61e44b7c96b028939186a) --- diff --git a/lang/node-serialport/Makefile b/lang/node-serialport/Makefile index 9a1a755cb7..59ba6ed105 100644 --- a/lang/node-serialport/Makefile +++ b/lang/node-serialport/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NPM_NAME:=serialport PKG_NAME:=node-$(PKG_NPM_NAME) PKG_VERSION:=6.1.1 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NPM_NAME)-$(PKG_VERSION).tgz PKG_SOURCE_URL:=http://registry.npmjs.org/$(PKG_NPM_NAME)/-/ @@ -46,12 +46,15 @@ endef CPU:=$(subst x86_64,x64,$(subst i386,ia32,$(ARCH))) EXTRA_LDFLAGS="$(FPIC) -L$(TOOLCHAIN_DIR)/lib/ -Wl,-rpath-link $(TOOLCHAIN_DIR)/lib/" \ +TMPNPM:=$(shell mktemp -u XXXXXXXXXX) + +TARGET_CFLAGS+=$(FPIC) 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