From f56c652def19ef99a1e32fb4ae1ccbffdb3cb10c Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Mon, 8 Jun 2020 12:32:10 +0200 Subject: [PATCH] package/nodejs: install to staging Install header files and libraries into the staging area. Some packages like mraa (if enabled for Node.js) search for node.h and v8.h. Hence, Node.js development file must be installed to the staging area. Signed-off-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni (cherry picked from commit f6e6e648cef2a1678d9ece72559301848caf08b1) Signed-off-by: Peter Korsgaard --- package/nodejs/nodejs.mk | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk index 7f875058b3..e291939981 100644 --- a/package/nodejs/nodejs.mk +++ b/package/nodejs/nodejs.mk @@ -11,6 +11,7 @@ NODEJS_DEPENDENCIES = host-python host-nodejs c-ares \ libuv zlib nghttp2 \ $(call qstrip,$(BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL_DEPS)) HOST_NODEJS_DEPENDENCIES = host-libopenssl host-python host-zlib +NODEJS_INSTALL_STAGING = YES NODEJS_LICENSE = MIT (core code); MIT, Apache and BSD family licenses (Bundled components) NODEJS_LICENSE_FILES = LICENSE @@ -215,6 +216,17 @@ define NODEJS_INSTALL_MODULES endef endif +define NODEJS_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) PYTHON=$(HOST_DIR)/bin/python2 \ + $(MAKE) -C $(@D) install \ + DESTDIR=$(STAGING_DIR) \ + $(TARGET_CONFIGURE_OPTS) \ + NO_LOAD=cctest.target.mk \ + PATH=$(@D)/bin:$(BR_PATH) \ + LDFLAGS="$(NODEJS_LDFLAGS)" \ + LD="$(TARGET_CXX)" +endef + define NODEJS_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) PYTHON=$(HOST_DIR)/bin/python2 \ $(MAKE) -C $(@D) install \